diff options
| author | Midnight Magic <midnightmagic@example.com> | 2014-02-05 11:24:42 -0800 |
|---|---|---|
| committer | Midnight Magic <midnightmagic@example.com> | 2014-02-05 11:24:42 -0800 |
| commit | 505867acaec4d8b2bcebd571eb5cba4ae4f7e402 (patch) | |
| tree | 41d55688a4fb522a9a9577df49e903d9e933afef /configure.ac | |
| parent | 0ff620e04eb9eaa8313137e0f7aaf30ce5acf485 (diff) | |
| download | bitcoin-505867acaec4d8b2bcebd571eb5cba4ae4f7e402.tar.xz | |
-Wl,-z,relro and -z,now were wiping out environmental LDFLAGS passed in by the user.
I moved them to HARDENING_* where they belong.
Diffstat (limited to 'configure.ac')
| -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 |