[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  8e5da579c131c493c91efeffe87b0a5cb398fee0 (commit)
      from  95c91cb3fc85a50969358e579793a73726f6e483 (commit)


- Log -----------------------------------------------------------------
commit 8e5da579c131c493c91efeffe87b0a5cb398fee0
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Aug 17 14:29:59 2018 +0200

    Configure: don't probe for --noexecstack assembler option on Darwin.
    
    The option has no meaning on Darwin, but it can bail out in combination
    with -fembed-bitcode or -no-integrated-as...
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 2eb8533..3baa8ce 100755
--- a/Configure
+++ b/Configure
@@ -1441,7 +1441,7 @@ if (!$disabled{makedepend}) {
     }
 }
 
-if (!$disabled{asm}) {
+if (!$disabled{asm} && !$predefined{__MACH__} && $^O ne 'VMS') {
     # probe for -Wa,--noexecstack option...
     if ($predefined{__clang__}) {
         # clang has builtin assembler, which doesn't recognize --help,
@@ -1449,7 +1449,7 @@ if (!$disabled{asm}) {
         # supported platforms even when it's meaningless. In other words
         # probe would fail, but probed option always accepted...
         push @{$config{cflags}}, "-Wa,--noexecstack", "-Qunused-arguments";
-    } elsif ($^O ne 'VMS') {
+    } else {
         my $cc = $config{CROSS_COMPILE}.$config{CC};
         open(PIPE, "$cc -Wa,--help -c -o null.$$.o -x assembler /dev/null 2>&1 |");
         while(<PIPE>) {