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/build-dependencies.mk | |
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/build-dependencies.mk')
-rw-r--r-- | rules/build-dependencies.mk | 4 |
1 files changed, 2 insertions, 2 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. |