summaryrefslogtreecommitdiff
path: root/mk/target.mk
diff options
context:
space:
mode:
authorsimonmar <unknown>2002-07-23 11:25:27 +0000
committersimonmar <unknown>2002-07-23 11:25:27 +0000
commitde309222fbdc6f57dc069c589d2477651008e221 (patch)
tree48207d281c3e8eb84e435d283f58da338d588b4f /mk/target.mk
parent55079266f41957519f3749e4fe59ca50c071fb76 (diff)
downloadhaskell-de309222fbdc6f57dc069c589d2477651008e221.tar.gz
[project @ 2002-07-23 11:25:27 by simonmar]
if $(STAMP_PKG_CONF) is non-null, then wait for it before generating dependencies. This avoids a race with 'make -j' where package.conf could get modified while the compiler is reading it.
Diffstat (limited to 'mk/target.mk')
-rw-r--r--mk/target.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/target.mk b/mk/target.mk
index ac222242ed..3a54c97257 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -72,7 +72,13 @@ include $(TOP)/mk/package.mk
# Compiler produced files that are targets of the source's imports.
MKDEPENDHS_OBJ_SUFFICES=o
-depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS)
+ifneq "$(STAMP_PKG_CONF)" ""
+PKGCONF_DEP = $(STAMP_PKG_CONF)
+else
+PKGCONF_DEP =
+endif
+
+depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(STAMP_PKG_CONF)
@$(RM) .depend
@touch .depend
ifneq "$(DOC_SRCS)" ""