diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-12-09 12:39:29 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-12-09 12:39:29 +0000 |
| commit | aea784af873f089a40af71849d83f59008562a58 (patch) | |
| tree | 750cdda524b53717b2171d9c5e49bedb97e52d58 /compiler/ghc.mk | |
| parent | 6ca3201b4bb8e5bfa0cd37646f1b0753fb975b29 (diff) | |
| download | haskell-aea784af873f089a40af71849d83f59008562a58.tar.gz | |
Eliminate mkdependC
We now just call gcc to get the dependencies directly
Diffstat (limited to 'compiler/ghc.mk')
| -rw-r--r-- | compiler/ghc.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index f2a4fc5310..abc3788705 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -29,6 +29,12 @@ endef compiler_CONFIG_HS = compiler/main/Config.hs +# This is just to avoid generating a warning when generating deps +# involving RtsFlags.h +compiler_stage1_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES +compiler_stage2_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES +compiler_stage3_MKDEPENDC_OPTS = -DMAKING_GHC_BUILD_SYSTEM_DEPENDENCIES + ifneq "$(BINDIST)" "YES" compiler/stage1/package-data.mk : $(compiler_CONFIG_HS) compiler/stage2/package-data.mk : $(compiler_CONFIG_HS) @@ -453,13 +459,13 @@ ifeq "$(stage)" "3" $(eval $(call build-package,compiler,stage3,2)) endif -$(compiler_stage1_depfile) : compiler/stage1/$(PLATFORM_H) -$(compiler_stage2_depfile) : compiler/stage2/$(PLATFORM_H) -$(compiler_stage3_depfile) : compiler/stage3/$(PLATFORM_H) +$(compiler_stage1_depfile_haskell) : compiler/stage1/$(PLATFORM_H) +$(compiler_stage2_depfile_haskell) : compiler/stage2/$(PLATFORM_H) +$(compiler_stage3_depfile_haskell) : compiler/stage3/$(PLATFORM_H) -$(compiler_stage1_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) -$(compiler_stage2_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) -$(compiler_stage3_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) +$(compiler_stage1_depfile_haskell) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) +$(compiler_stage2_depfile_haskell) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) +$(compiler_stage3_depfile_haskell) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_GHCCONSTANTS) $(includes_DERIVEDCONSTANTS) $(PRIMOP_BITS) # Every Constants.o object file depends on includes/GHCConstants.h: $(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS) includes/HaskellConstants.hs)) |