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_0h~145
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=17467da86cbc4957dab341dc329ab2db1b004fe5;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)

(cherry picked from commit f720194cbc174806fe1ce9c349edd249d8076c02)
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 91f083fa41..52de5e70b0 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1723,9 +1723,7 @@ sub vms_info {
     "uClinux-dist" => {
         inherit_from     => [ "BASE_unix" ],
         cc               => "$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",
@@ -1739,9 +1737,7 @@ sub vms_info {
     "uClinux-dist64" => {
         inherit_from     => [ "BASE_unix" ],
         cc               => "$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",