diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2014-03-27 12:33:44 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2014-03-27 12:37:44 +0000 |
| commit | d011cdefca7aa66cbcf71c941f38a4e6dd4c5579 (patch) | |
| tree | 23c5c42bee39cd943d21689bd3579abc431eca6d /utils | |
| parent | e7f26cd3e7e9eb92e3eb3457730e635747b43050 (diff) | |
| download | haskell-d011cdefca7aa66cbcf71c941f38a4e6dd4c5579.tar.gz | |
Include SRC_CC_OPTS and SRC_LD_OPTS when compiling ghc-cabal
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 29db69cfef..ff5762a655 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -31,7 +31,10 @@ $(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*.hs) $(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) --make utils/ghc-cabal/Main.hs -o $@ \ + "$(GHC)" $(SRC_HC_OPTS) \ + $(addprefix -optc, $(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE0)) \ + $(addprefix -optl, $(SRC_LD_OPTS) $(CONF_LD_OPTS_STAGE0)) \ + --make utils/ghc-cabal/Main.hs -o $@ \ -no-user-$(GHC_PACKAGE_DB_FLAG) \ -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \ -DCABAL_VERSION=$(CABAL_VERSION) \ @@ -65,4 +68,3 @@ utils/ghc-cabal_dist-install_WANT_BINDIST_WRAPPER = YES utils/ghc-cabal_dist-install_MODULES = Main $(eval $(call build-prog,utils/ghc-cabal,dist-install,1)) - |