summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorSergei Trofimovich <siarheit@google.com>2016-12-17 13:30:41 +0000
committerSergei Trofimovich <siarheit@google.com>2016-12-17 16:47:58 +0000
commita6657bd0d6b9949098021d89ed3cd8a943bdd3b6 (patch)
tree033135d8896353e58b22407ebdc13b3f4f191c5a /rules
parent2fa00f5b22dd9ea39eb1f5c9b52bbdbca0a37925 (diff)
downloadhaskell-a6657bd0d6b9949098021d89ed3cd8a943bdd3b6.tar.gz
revert '-Wl' prefixing to *_LD_OPTS
This reverts f48f5a9ebf384e1e157b7b413e1d779f4289ddd2 The prefixing does not work as comma is stripped by $(addprefix) macro: The following call $$(addprefix -optl-Wl, $$($1_$2_$3_ALL_LD_OPTS)) prefixes options with "-optl-Wl" not with "-optl-Wl," The simplest breakage can be seen by adding SRC_LD_OPTS += -O1 to mk/build.mk: <no location info>: error: Warning: Couldn't figure out linker information! Make sure you're using GNU ld, GNU gold or the built in OS X linker, etc. gcc: error: unrecognized command line option '-Wl-O1' Another problem with original change is loss of ability to pass options to gcc as a linker driver, for example: SRC_LD_OPTS += -flto Signed-off-by: Sergei Trofimovich <siarheit@google.com>
Diffstat (limited to 'rules')
-rw-r--r--rules/distdir-way-opts.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index 602e6eb94d..6ae9807944 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -207,7 +207,7 @@ $1_$2_$3_ALL_LD_OPTS = \
# Options for passing to GHC when we use it for linking
$1_$2_$3_GHC_LD_OPTS = \
- $$(addprefix -optl-Wl, $$($1_$2_$3_ALL_LD_OPTS)) \
+ $$(addprefix -optl, $$($1_$2_$3_ALL_LD_OPTS)) \
$$($1_$2_$3_MOST_HC_OPTS)
$1_$2_$3_ALL_AS_OPTS = \