diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-11-21 17:49:16 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-11-21 17:49:16 +0000 |
| commit | a68ffce3fa1871c21ed51b0414404c365df3aabf (patch) | |
| tree | 27fc601ce564e830818c803472a0e2193aad54ea /rules | |
| parent | 9a82b1ffa35fa4c3927c66a1037a37d436cf6aac (diff) | |
| download | haskell-a68ffce3fa1871c21ed51b0414404c365df3aabf.tar.gz | |
Fix a makefile include ordering sanity check
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-prog.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 3fbed21efb..4121ca34b1 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -139,13 +139,17 @@ endif # need to depend on the libraries too. NB. since $(ALL_STAGE1_LIBS) and # $(ALL_RTS_LIBS) are not defined until after libraries/*/ghc.mk have # been included, this introduces an ordering dependency. +ifneq "$$(CLEANING)" "YES" ifneq "$3" "0" -ifeq "$$(ALL_STAGE1_LIBS)" "" -$$(error ordering failure in $1: $$(ALL_STAGE1_LIBS) is empty) +ifneq "$$($1_$2_HS_SRCS)" "" +ifeq "$$(strip $$(ALL_STAGE1_LIBS))" "" +$$(error ordering failure in $1 ($2): ALL_STAGE1_LIBS is empty) +endif endif $1/$2/build/tmp/$$($1_$2_PROG) : $$(ALL_STAGE1_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS) endif endif +endif ifeq "$$($1_$2_INSTALL_INPLACE)" "NO" $(call all-target,$1_$2,$1/$2/build/tmp/$$($1_$2_PROG)) |