projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more location info in CoreLint
[ghc-hetmet.git]
/
compiler
/
ghc.mk
diff --git
a/compiler/ghc.mk
b/compiler/ghc.mk
index
5387c8b
..
7eaa158
100644
(file)
--- a/
compiler/ghc.mk
+++ b/
compiler/ghc.mk
@@
-38,12
+38,12
@@
compiler_stage3_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES
compiler_stage1_C_FILES_NODEPS = compiler/parser/cutils.c
ifneq "$(BINDIST)" "YES"
compiler_stage1_C_FILES_NODEPS = compiler/parser/cutils.c
ifneq "$(BINDIST)" "YES"
-compiler/stage1/package-data.mk : $(compiler_CONFIG_HS)
-compiler/stage2/package-data.mk : $(compiler_CONFIG_HS)
-compiler/stage3/package-data.mk : $(compiler_CONFIG_HS)
+compiler/stage1/package-data.mk : compiler/stage1/build/Config.hs
+compiler/stage2/package-data.mk : compiler/stage2/build/Config.hs
+compiler/stage3/package-data.mk : compiler/stage3/build/Config.hs
endif
endif
-$(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
+compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
"$(RM)" $(RM_OPTS) $@
@echo 'Creating $@ ... '
@echo '{-# LANGUAGE CPP #-}' >> $@
"$(RM)" $(RM_OPTS) $@
@echo 'Creating $@ ... '
@echo '{-# LANGUAGE CPP #-}' >> $@
@@
-70,6
+70,10
@@
$(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
@echo 'cBooterVersion = "$(GhcVersion)"' >> $@
@echo 'cStage :: String' >> $@
@echo 'cStage = show (STAGE :: Int)' >> $@
@echo 'cBooterVersion = "$(GhcVersion)"' >> $@
@echo 'cStage :: String' >> $@
@echo 'cStage = show (STAGE :: Int)' >> $@
+ @echo 'cCcOpts :: [String]' >> $@
+ @echo 'cCcOpts = words "$(CONF_CC_OPTS_STAGE$*)"' >> $@
+ @echo 'cLdOpts :: [String]' >> $@
+ @echo 'cLdOpts = words "$(CONF_LD_OPTS_STAGE$*)"' >> $@
@echo 'cIntegerLibrary :: String' >> $@
@echo 'cIntegerLibrary = "$(INTEGER_LIBRARY)"' >> $@
@echo 'cSplitObjs :: String' >> $@
@echo 'cIntegerLibrary :: String' >> $@
@echo 'cIntegerLibrary = "$(INTEGER_LIBRARY)"' >> $@
@echo 'cSplitObjs :: String' >> $@
@@
-140,7
+144,8
@@
else
endif
@echo done.
endif
@echo done.
-$(eval $(call clean-target,compiler,config_hs,$(compiler_CONFIG_HS)))
+# XXX 2010-08-19: This is a legacy clean. Remove later.
+$(eval $(call clean-target,compiler,config_hs,compiler/main/Config.hs))
# -----------------------------------------------------------------------------
# Create platform includes
# -----------------------------------------------------------------------------
# Create platform includes