From: Richard Levitte <levitte@openssl.org>
Date: Tue, 29 Mar 2016 20:06:07 +0000 (+0200)
Subject: Config: The cflags in vms-alpha and vms-ia64 have to be added
X-Git-Tag: OpenSSL_1_1_0-pre5~206
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0a2629b38e5f8ea95e51fff170e64ac59716a212;p=oweals%2Fopenssl.git

Config: The cflags in vms-alpha and vms-ia64 have to be added

"vms-generic" already has some values, which were discarded.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 45a685fba2..11ff13e348 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1740,10 +1740,10 @@ sub vms_info {
     #},
     "vms-alpha" => {
         inherit_from     => [ "vms-generic" ],
-        cflags           => sub { my @warnings =
-                                      @{vms_info()->{disable_warns}};
-                                  @warnings
-                                      ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); },
+        cflags           => add(sub { my @warnings =
+                                          @{vms_info()->{disable_warns}};
+                                      @warnings
+                                          ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }),
         #as               => "???",
         #debug_aflags     => "/NOOPTIMIZE/DEBUG",
         #release_aflags   => "/OPTIMIZE/NODEBUG",
@@ -1773,10 +1773,10 @@ sub vms_info {
     },
     "vms-ia64" => {
         inherit_from     => [ "vms-generic" ],
-        cflags           => sub { my @warnings =
-                                      @{vms_info()->{disable_warns}};
-                                  @warnings
-                                      ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); },
+        cflags           => add(sub { my @warnings =
+                                          @{vms_info()->{disable_warns}};
+                                      @warnings
+                                          ? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }),
         #as               => "I4S",
         #debug_aflags     => "/NOOPTIMIZE/DEBUG",
         #release_aflags   => "/OPTIMIZE/NODEBUG",