diff options
| author | Sergei Trofimovich <siarheit@google.com> | 2016-12-17 20:25:19 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <siarheit@google.com> | 2016-12-17 22:49:25 +0000 |
| commit | 87c3b1d4395c3d4fc7a5272717c48f3f525da959 (patch) | |
| tree | b514db2dce2ac164e449428d2b038d48f96ab391 /aclocal.m4 | |
| parent | 0af959b1999b48f3b8e6c47184b6f8c80b4c452d (diff) | |
| download | haskell-87c3b1d4395c3d4fc7a5272717c48f3f525da959.tar.gz | |
fix OpenBSD linkage (wxneeded)
There is two types of options passed directly to 'ld'
(and not to 'gcc' driver):
- CONF_LD_LINKER_OPTS_STAGE$4
- EXTRA_LD_OPTS
This changedoes two things:
- split 'EXTRA_LD_OPTS' into two variables:
- EXTRA_LD_OPTS (accepts 'gcc' wrapper options)
- EXTRA_LD_LINKER_OPTS (accepts raw 'ld' options)
- wraps all LD_LINKER options as '-Wl,' when passed
to 'gcc' driver.
Fixes https://phabricator.haskell.org/D2776
Signed-off-by: Sergei Trofimovich <siarheit@google.com>
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 5d395709a0..4673ac0185 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -658,7 +658,7 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS], x86_64-*-openbsd*) # We need -z wxneeded at least to link ghc-stage2 to workaround # W^X issue in GHCi on OpenBSD current (as of Aug 2016) - $3="$$3 -Wl,-zwxneeded" + $3="$$3 -Wl,-z,wxneeded" $4="$$4 -z wxneeded" ;; |