diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-01-08 12:40:06 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-01-08 13:10:58 +0100 |
| commit | f720194cbc174806fe1ce9c349edd249d8076c02 (patch) | |
| tree | 01aac027c0b7b337699d44f390e81baf66fe3f8a /Configurations | |
| parent | a5a0f328af8c72b1edfc5e59be1c2de9d8b2b358 (diff) | |
Clean up uClinux targets
The uClinux targets included some attributes that would result in
circular references of CFLAGS and LDCLAGS.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5034)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index bff0db57d8..08bb839de5 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1700,9 +1700,7 @@ my %targets = ( "uClinux-dist" => { inherit_from => [ "BASE_unix" ], cc => sub { env('CC') }, - cflags => combine("\$(CFLAGS)", - threads("-D_REENTRANT")), - plib_lflags => "\$(LDFLAGS)", + cflags => combine(threads("-D_REENTRANT")), ex_libs => add("\$(LDLIBS)"), bn_ops => "BN_LLONG", thread_scheme => "pthreads", @@ -1715,9 +1713,7 @@ my %targets = ( "uClinux-dist64" => { inherit_from => [ "BASE_unix" ], cc => sub { env('CC') }, - cflags => combine("\$(CFLAGS)", - threads("-D_REENTRANT")), - plib_lflags => "\$(LDFLAGS)", + cflags => combine(threads("-D_REENTRANT")), ex_libs => add("\$(LDLIBS)"), bn_ops => "SIXTY_FOUR_BIT_LONG", thread_scheme => "pthreads", |