QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-17 20:09:41 +00:00
Code Issues Projects Releases Wiki Activity

Clean up uClinux targets

Browse Source 
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)
This commit is contained in:
Richard Levitte 2018-01-08 12:40:06 +01:00
parent a5a0f328af
commit f720194cbc
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Configurations/10-main.conf
View File

@ -1700,9 +1700,7 @@ my %targets = (
"uClinux-dist" => { "uClinux-dist" => {
inherit_from => [ "BASE_unix" ], inherit_from => [ "BASE_unix" ],
cc => sub { env('CC') }, cc => sub { env('CC') },
cflags => combine("\$(CFLAGS)", cflags => combine(threads("-D_REENTRANT")),
threads("-D_REENTRANT")),
plib_lflags => "\$(LDFLAGS)",
ex_libs => add("\$(LDLIBS)"), ex_libs => add("\$(LDLIBS)"),
bn_ops => "BN_LLONG", bn_ops => "BN_LLONG",
thread_scheme => "pthreads", thread_scheme => "pthreads",
@ -1715,9 +1713,7 @@ my %targets = (
"uClinux-dist64" => { "uClinux-dist64" => {
inherit_from => [ "BASE_unix" ], inherit_from => [ "BASE_unix" ],
cc => sub { env('CC') }, cc => sub { env('CC') },
cflags => combine("\$(CFLAGS)", cflags => combine(threads("-D_REENTRANT")),
threads("-D_REENTRANT")),
plib_lflags => "\$(LDFLAGS)",
ex_libs => add("\$(LDLIBS)"), ex_libs => add("\$(LDLIBS)"),
bn_ops => "SIXTY_FOUR_BIT_LONG", bn_ops => "SIXTY_FOUR_BIT_LONG",
thread_scheme => "pthreads", thread_scheme => "pthreads",