The branch master has been updated
via 0a2629b38e5f8ea95e51fff170e64ac59716a212 (commit)
from 5fe5bc3094339626c6a7d3dd9149b7375c3940bb (commit)
- Log -----------------------------------------------------------------
commit 0a2629b38e5f8ea95e51fff170e64ac59716a212
Author: Richard Levitte <[email protected]>
Date: Tue Mar 29 22:06:07 2016 +0200
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 <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/10-main.conf | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 45a685f..11ff13e 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",
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
