summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-10-22 00:00:20 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-10-23 05:59:07 -0400
commit21663693524838cf0621a887602368fcb54c1c0a (patch)
tree955b49fc68f287a20936087834390e7eb9323031 /rules
parent4af20bbc07626815eb0ec04fe665a32bb1827480 (diff)
downloadhaskell-21663693524838cf0621a887602368fcb54c1c0a.tar.gz
Drop duplicate -optl's from GHC invocations
Previously the make build system would pass things like `-optl-optl-Wl,-x -optl-optl-Wl,noexecstack` to GHC. This would naturally result in mass confusion as GHC would pass `-optl-Wl,-x` to GCC. GCC would in turn interpret this as `-o ptl-Wl,-x`, setting the output pass of the invocation. The problem that `-optl` was added to the command-line in two places in the build system. Fix this. Fixes #17385.
Diffstat (limited to 'rules')
-rw-r--r--rules/distdir-way-opts.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index 692f21a70f..d604fcf621 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -186,8 +186,8 @@ $1_$2_$3_ALL_LD_OPTS = \
$$($1_$2_$3_LD_OPTS) \
$$($1_$2_EXTRA_LD_OPTS) \
$$(EXTRA_LD_OPTS) \
- $$(foreach o,$$(EXTRA_LD_LINKER_OPTS),-optl-Wl$$(comma)$$o) \
- $$(foreach o,$$(CONF_LD_LINKER_OPTS_STAGE$4),-optl-Wl$$(comma)$$o)
+ $$(foreach o,$$(EXTRA_LD_LINKER_OPTS),-Wl$$(comma)$$o) \
+ $$(foreach o,$$(CONF_LD_LINKER_OPTS_STAGE$4),-Wl$$(comma)$$o)
# Options for passing to GHC when we use it for linking
$1_$2_$3_GHC_LD_OPTS = \