projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
85d3c9b
)
Pass SRC_HC_OPTS to GHC when building GHC's Main.hs
author
Ian Lynagh
<igloo@earth.li>
Fri, 26 Sep 2008 13:16:09 +0000
(13:16 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Fri, 26 Sep 2008 13:16:09 +0000
(13:16 +0000)
ghc/Makefile
patch
|
blob
|
history
diff --git
a/ghc/Makefile
b/ghc/Makefile
index
f1666d1
..
29ca7a8
100644
(file)
--- a/
ghc/Makefile
+++ b/
ghc/Makefile
@@
-88,9
+88,10
@@
CONFIGURE_FLAGS_STAGE1 += $(foreach flag, $(GhcStage1HcOpts), --ghc-option=$(fla
CONFIGURE_FLAGS_STAGE2 += $(foreach flag, $(GhcStage2HcOpts), --ghc-option=$(flag))
CONFIGURE_FLAGS_STAGE3 += $(foreach flag, $(GhcStage3HcOpts), --ghc-option=$(flag))
CONFIGURE_FLAGS_STAGE2 += $(foreach flag, $(GhcStage2HcOpts), --ghc-option=$(flag))
CONFIGURE_FLAGS_STAGE3 += $(foreach flag, $(GhcStage3HcOpts), --ghc-option=$(flag))
+BUILD_FLAGS += $(patsubst %, --ghc-option=%, $(SRC_HC_OPTS))
# Allow EXTRA_HC_OPTS to be used from the command line to add options
# when building (e.g. -v)
# Allow EXTRA_HC_OPTS to be used from the command line to add options
# when building (e.g. -v)
-BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
+BUILD_FLAGS += $(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
# XXX In stage2+ we should really use the inplace ghc-pkg
# It works because installPackage doesn't actually use ghc-pkg, as there's
# XXX In stage2+ we should really use the inplace ghc-pkg
# It works because installPackage doesn't actually use ghc-pkg, as there's