The branch master has been updated
via f720194cbc174806fe1ce9c349edd249d8076c02 (commit)
from a5a0f328af8c72b1edfc5e59be1c2de9d8b2b358 (commit)
- Log -----------------------------------------------------------------
commit f720194cbc174806fe1ce9c349edd249d8076c02
Author: Richard Levitte <[email protected]>
Date: Mon Jan 8 12:40:06 2018 +0100
Clean up uClinux targets
The uClinux targets included some attributes that would result in
circular references of CFLAGS and LDCLAGS.
Reviewed-by: Matt Caswell <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/5034)
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index bff0db5..08bb839 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",
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
