diff options
author | Andy Polyakov <appro@openssl.org> | 2018-08-17 14:29:59 +0200 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2018-08-18 18:23:22 +0200 |
commit | 8e5da579c131c493c91efeffe87b0a5cb398fee0 (patch) | |
tree | 110430f10f456377f0089e8f5913423d20afc26c | |
parent | 95c91cb3fc85a50969358e579793a73726f6e483 (diff) |
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@openssl.org>
-rwxr-xr-x | Configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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>) { |