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 45a685fba2471cebb9f575086bea00ec77428f63..11ff13e348f9d4b38543cb1ad5791d6e6ca931f7 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1740,10 +1740,10 @@ sub vms_info {
     #},
     "vms-alpha" => {
         inherit_from     => [ "vms-generic" ],
     #},
     "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",
         #as               => "???",
         #debug_aflags     => "/NOOPTIMIZE/DEBUG",
         #release_aflags   => "/OPTIMIZE/NODEBUG",


@@ -1773,10 +1773,10 @@ sub vms_info {
     },
     "vms-ia64" => {
         inherit_from     => [ "vms-generic" ],
     },
     "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",
         #as               => "I4S",
         #debug_aflags     => "/NOOPTIMIZE/DEBUG",
         #release_aflags   => "/OPTIMIZE/NODEBUG",