ghc-cabal: Use correct name of linker flags env variable
authorBen Gamari <bgamari.foss@gmail.com>
Fri, 4 Nov 2016 19:03:33 +0000 (15:03 -0400)
committerBen Gamari <ben@smart-cactus.org>
Thu, 10 Nov 2016 18:16:03 +0000 (13:16 -0500)
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

utils/ghc-cabal/ghc.mk

index 38f7951..78a6705 100644 (file)
@@ -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 $@ \