[commit: ghc] ghc-8.0: ghc-cabal: Use correct name of linker flags env variable (3a0532a)

git at git.haskell.org git at git.haskell.org
Thu Nov 10 21:42:41 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/3a0532a8586c09a71d9a9847964928c04853cbf7/ghc

>---------------------------------------------------------------

commit 3a0532a8586c09a71d9a9847964928c04853cbf7
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
    
    (cherry picked from commit 97505ad7b23f5e43e1e1a69c159c2c7054f600e7)


>---------------------------------------------------------------

3a0532a8586c09a71d9a9847964928c04853cbf7
 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 62338ee..01562ce 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