[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  17467da86cbc4957dab341dc329ab2db1b004fe5 (commit)
      from  16788628bbe07887029bbf8c98d698000a6b9d58 (commit)


- Log -----------------------------------------------------------------
commit 17467da86cbc4957dab341dc329ab2db1b004fe5
Author: Richard Levitte <levitte at openssl.org>
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 <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5034)
    
    (cherry picked from commit f720194cbc174806fe1ce9c349edd249d8076c02)

-----------------------------------------------------------------------

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 91f083f..52de5e7 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",