From 17467da86cbc4957dab341dc329ab2db1b004fe5 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
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 <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5034)
(cherry picked from commit f720194cbc174806fe1ce9c349edd249d8076c02)
---
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 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",
--
2.40.0