[commit: ghc] ghc-7.8: Include SRC_CC_OPTS and SRC_LD_OPTS when compiling ghc-cabal (8351e13)
git at git.haskell.org
git at git.haskell.org
Mon Apr 14 13:53:26 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-7.8
Link : http://ghc.haskell.org/trac/ghc/changeset/8351e13d45893766104e1cdb14e30bc53f3cbcc7/ghc
>---------------------------------------------------------------
commit 8351e13d45893766104e1cdb14e30bc53f3cbcc7
Author: Simon Marlow <marlowsd at gmail.com>
Date: Thu Mar 27 12:33:44 2014 +0000
Include SRC_CC_OPTS and SRC_LD_OPTS when compiling ghc-cabal
(cherry picked from commit d011cdefca7aa66cbcf71c941f38a4e6dd4c5579)
>---------------------------------------------------------------
8351e13d45893766104e1cdb14e30bc53f3cbcc7
utils/ghc-cabal/ghc.mk | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index 29db69c..ff5762a 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))
-
More information about the ghc-commits
mailing list