[commit: ghc] master: ghc-cabal: Use correct name of linker flags env variable (500d90d)
git at git.haskell.org
git at git.haskell.org
Thu Nov 10 18:50:56 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/500d90d2ec841453a2b4162307ea706aa2cb5b1e/ghc
>---------------------------------------------------------------
commit 500d90d2ec841453a2b4162307ea706aa2cb5b1e
Author: Ben Gamari <bgamari.foss at gmail.com>
Date: Fri Nov 4 15:03:33 2016 -0400
ghc-cabal: Use correct name of linker flags env variable
Currently passing the `CONF_LD_LINKER_OPTS_STAGE0` environment
variable to `configure` is broken due to this naming inconsistency.
Test Plan: Try passing `CONF_LD_LINKER_OPTS_STAGE0` to `configure`.
Look at resulting stage0 ghc invocation.
Reviewers: austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2672
>---------------------------------------------------------------
500d90d2ec841453a2b4162307ea706aa2cb5b1e
utils/ghc-cabal/ghc.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index 38f7951..78a6705 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -47,7 +47,7 @@ $(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*.hs)
$(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/.
"$(GHC)" $(SRC_HC_OPTS) \
$(addprefix -optc, $(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE0)) \
- $(addprefix -optl, $(SRC_LD_OPTS) $(CONF_LD_OPTS_STAGE0)) \
+ $(addprefix -optl, $(SRC_LD_OPTS) $(CONF_GCC_LINKER_OPTS_STAGE0)) \
-hide-all-packages \
$(addprefix -package , $(CABAL_BUILD_DEPS)) \
--make utils/ghc-cabal/Main.hs -o $@ \
More information about the ghc-commits
mailing list