diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-01-27 00:17:39 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-01-27 00:17:39 +0000 |
| commit | c1e824a275339da8fae6614f5a0db751874d0a36 (patch) | |
| tree | d0ef3aa81de615dc808dd1cf2bf2450269a0798b /rules | |
| parent | ff3bfae6010625b7ffe96bc62e8e139870684600 (diff) | |
| download | haskell-c1e824a275339da8fae6614f5a0db751874d0a36.tar.gz | |
Fix "make 1" etc following the build system changes
The logic is now in mk/compiler-ghc.mk rather than being duplicated in
ghc/Makefile and compiler/Makefile.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-dependencies.mk | 4 | ||||
| -rw-r--r-- | rules/build-package-data.mk | 2 | ||||
| -rw-r--r-- | rules/include-dependencies.mk | 12 |
3 files changed, 15 insertions, 3 deletions
diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk index 3aa176cf05..e6d493ccf7 100644 --- a/rules/build-dependencies.mk +++ b/rules/build-dependencies.mk @@ -25,7 +25,7 @@ $1_$2_C_FILES_DEPS = $$(filter-out $$($1_$2_C_FILES_NODEPS),$$($1_$2_C_FILES)) $1_$2_MKDEPENDHS_FLAGS = -dep-makefile $$($1_$2_depfile_haskell).tmp $$(foreach way,$$(filter-out v,$$($1_$2_WAYS)),-dep-suffix $$(way)) $1_$2_MKDEPENDHS_FLAGS += -include-pkg-deps -ifneq "$$($1_$2_NO_BUILD_DEPS)" "YES" +ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES" # Some of the Haskell files (e.g. utils/hsc2hs/Main.hs) (directly or # indirectly) include the generated includes files. @@ -69,7 +69,7 @@ endif echo "$1_$2_depfile_c_asm_EXISTS = YES" >> $$@.tmp mv $$@.tmp $$@ -endif # $1_$2_NO_BUILD_DEPS +endif # NO_GENERATED_MAKEFILE_RULES # Note sed magic above: mkdependC can't do -odir stuff, so we have to # munge the dependencies it generates to refer to the correct targets. diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index dcffee6110..86f9323859 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -64,6 +64,7 @@ $1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS) endif ifneq "$$(BINDIST)" "YES" +ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES" $1/$2/inplace-pkg-config : $1/$2/package-data.mk $1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk @@ -78,6 +79,7 @@ ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO" endif endif endif +endif PACKAGE_DATA_MKS += $1/$2/package-data.mk diff --git a/rules/include-dependencies.mk b/rules/include-dependencies.mk index b93311075f..ad1c230f4f 100644 --- a/rules/include-dependencies.mk +++ b/rules/include-dependencies.mk @@ -17,7 +17,17 @@ $(call profStart, include-dependencies($1,$2,$3)) # $2 = distdir # $3 = GHC stage to use (0 == bootstrapping compiler) -ifneq "$$(NO_INCLUDE_DEPS)" "YES" +$1_$2_INCLUDE_DEPFILES = YES +ifeq "$$(NO_INCLUDE_DEPS)" "YES" +$1_$2_INCLUDE_DEPFILES = NO +endif +ifneq "$$(ONLY_DEPS_FOR)" "" +ifeq "$$(filter $1_$2,$$(ONLY_DEPS_FOR))" "" +$1_$2_INCLUDE_DEPFILES = NO +endif +endif + +ifeq "$$($1_$2_INCLUDE_DEPFILES)" "YES" ifneq "$$(strip $$($1_$2_HS_SRCS) $$($1_$2_HS_BOOT_SRCS))" "" ifneq "$$(NO_STAGE$3_DEPS)" "YES" include $$($1_$2_depfile_haskell) |