diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-05 20:43:15 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-05 20:43:23 +0100 |
| commit | a41922eccc1843d99af9465917c239e504a5c2d3 (patch) | |
| tree | 41d55688a4fb522a9a9577df49e903d9e933afef | |
| parent | 0ff620e04eb9eaa8313137e0f7aaf30ce5acf485 (diff) | |
| parent | 505867acaec4d8b2bcebd571eb5cba4ae4f7e402 (diff) | |
| download | bitcoin-a41922eccc1843d99af9465917c239e504a5c2d3.tar.xz | |
Merge pull request #3634
505867a -Wl,-z,relro and -z,now were wiping out environmental LDFLAGS passed in by the user. I moved them to HARDENING_* where they belong. (Midnight Magic)
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a182a3e79a..3ed4549a88 100644 --- a/configure.ac +++ b/configure.ac @@ -303,8 +303,8 @@ if test x$use_hardening != xno; then AX_CHECK_LINK_FLAG([[-Wl,--dynamicbase]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--dynamicbase"]) AX_CHECK_LINK_FLAG([[-Wl,--nxcompat]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--nxcompat"]) - AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [LDFLAGS="-Wl,-z,relro"]) - AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [LDFLAGS="-Wl,-z,now"]) + AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"]) + AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"]) if test x$TARGET_OS != xwindows; then # -pie will link successfully with MinGW, but it's unsupported and leads to undeterministic binaries |