diff options
| author | Sergei Trofimovich <siarheit@google.com> | 2016-12-17 13:30:41 +0000 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-01-03 23:04:11 -0500 |
| commit | f6e8d45d6860996e7db9dcd4b440eabac710fa5e (patch) | |
| tree | da899767e35ec7b6f203f61220d2425edb73bb0f | |
| parent | b85dc18f731d7cc4eb4deb973931ef93671292d6 (diff) | |
| download | haskell-f6e8d45d6860996e7db9dcd4b440eabac710fa5e.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>
(cherry picked from commit a6657bd0d6b9949098021d89ed3cd8a943bdd3b6)
| -rw-r--r-- | rules/distdir-way-opts.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index 61e03ee3bb..7ba6ebc31b 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -201,7 +201,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 = \ |