diff options
| author | Sverker Eriksson <[email protected]> | 2017-03-28 19:33:08 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-28 19:33:08 +0200 |
| commit | 14683af3f9ec296db455802f04165d1cd260bb70 (patch) | |
| tree | 160e1b9bbf6a839148792376a050dc3307ec9458 /erts | |
| parent | 1ec9366f468026a216c1c8cd78c7f512bae37ae5 (diff) | |
| parent | baabfad325f6d2de4cfd33be49ca5511cfa548ea (diff) | |
| download | otp-14683af3f9ec296db455802f04165d1cd260bb70.tar.gz otp-14683af3f9ec296db455802f04165d1cd260bb70.tar.bz2 otp-14683af3f9ec296db455802f04165d1cd260bb70.zip | |
Merge PR-1379 from ostrovsky/erl-294 OTP-14307
Improve no-pie solution from bug report ERL-294
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/configure.in b/erts/configure.in index 1c4a3e90ef..7c6f4b163c 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -2836,9 +2836,10 @@ if test X${enable_hipe} = Xyes && test X$ARCH = Xamd64; then saved_LDFLAGS=$LDFLAGS LDFLAGS="-no-pie $LDFLAGS" AC_TRY_LINK(,, [], - [AC_MSG_WARN([Linked does not accept option -no-pie]) - LDFLAGS=$saved_LDFLAGS])]) - + [LDFLAGS="-fno-PIE $saved_LDFLAGS" + AC_TRY_LINK(,, [], + [AC_MSG_WARN([Linked does not accept option -no-pie nor -fno-PIE]) + LDFLAGS=$saved_LDFLAGS])])]) fi |