From: Richard Levitte <levitte@openssl.org>
Date: Mon, 8 Jan 2018 11:40:06 +0000 (+0100)
Subject: Clean up uClinux targets
X-Git-Tag: OpenSSL_1_1_1-pre1~219
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f720194cbc174806fe1ce9c349edd249d8076c02;p=oweals%2Fopenssl.git

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)
---

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",