diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-06-12 10:48:27 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-06-12 10:48:27 +0000 |
| commit | 2675f2b68794ef6712e1ea0b9ec110c46c9e5ebf (patch) | |
| tree | d03db9402d1be6f6bf67ac6eea156e684a88eac2 /compiler/ghc.mk | |
| parent | 498999593cd93568e9c9dcfdaeb80222ba97587c (diff) | |
| download | haskell-2675f2b68794ef6712e1ea0b9ec110c46c9e5ebf.tar.gz | |
Fix the compiler-hs-dependency's
We needed some more $s to delay evaluation until the values are
available, and the calls needed to be later in the ghc.mk so that
compiler_stage2_WAYS etc are defined.
Diffstat (limited to 'compiler/ghc.mk')
| -rw-r--r-- | compiler/ghc.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 416d7bfc94..400b6b3d48 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -17,7 +17,7 @@ define compiler-hs-dependency # args: $1 = module, $2 = dependency $$(foreach stage,1 2 3,\ $$(foreach way,$$(compiler_stage$$(stage)_WAYS),\ - compiler/stage$$(stage)/build/$1.$($(way)_osuf))) : $2 + compiler/stage$$(stage)/build/$1.$$($$(way)_osuf))) : $2 endef @@ -235,9 +235,6 @@ endif compiler/stage3/$(PLATFORM_H) : compiler/stage2/$(PLATFORM_H) "$(CP)" $< $@ -# Every Constants.o object file depends on includes/GHCConstants.h: -$(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS))) - # ---------------------------------------------------------------------------- # Generate supporting stuff for prelude/PrimOp.lhs # from prelude/primops.txt @@ -283,9 +280,6 @@ compiler/primop-strictness.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) compiler/primop-primop-info.hs-incl: $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) "$(GENPRIMOP_INPLACE)" --primop-primop-info < $< > $@ -# Every PrimOp.o object file depends on $(PRIMOP_BITS): -$(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS))) - # Usages aren't used any more; but the generator # can still generate them if we want them back compiler/primop-usage.hs-incl: $(PRIMOPS_TXT) @@ -458,6 +452,12 @@ $(compiler_stage1_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(inclu $(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) +# Every Constants.o object file depends on includes/GHCConstants.h: +$(eval $(call compiler-hs-dependency,Constants,$(includes_GHCCONSTANTS))) + +# Every PrimOp.o object file depends on $(PRIMOP_BITS): +$(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS))) + # Note [munge-stage1-package-config] # Strip the date/patchlevel from the version of stage1. See Note # [fiddle-stage1-version] above. |