From f720194cbc174806fe1ce9c349edd249d8076c02 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 8 Jan 2018 12:40:06 +0100 Subject: [PATCH] Clean up uClinux targets The uClinux targets included some attributes that would result in circular references of CFLAGS and LDCLAGS. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/5034) --- 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 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", -- 2.25.1