summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2011-06-15 18:50:35 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2011-08-08 11:59:09 +0200
commit20f410fea8dee5df649762de163a4e29ad2b3074 (patch)
tree40d094b20db4a6da03d39a4281ba8e4b6cbfaaf1 /Makefile.in
parent2d4b312ec5b44ecc1d9cf549224efe121f424098 (diff)
downloaderlang-20f410fea8dee5df649762de163a4e29ad2b3074.tar.gz
erts: Fix dependency generation
Apparantly, an invocation like "make generate depend" will run the 'generate' and 'depend' targets in parallel, even if the Makefile contains a .NOTPARALLEL target. In this case, it will result in incorrect dependencies since not all files have been generated when the dependencies are computed. Split up the single 'make' invocation to two invocations, to force the targets to be run sequentially.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 5dc54d42f7..96a9c407b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -489,7 +489,8 @@ preloaded:
$(MAKE) opt BUILD_ALL=true
dep depend:
- test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) generate depend)
+ test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) generate)
+ test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/emulator && ERL_TOP=$(ERL_TOP) $(MAKE) depend)
test X"$$ERTS_SKIP_DEPEND" = X"true" || (cd erts/lib_src && ERL_TOP=$(ERL_TOP) $(MAKE) depend)
# Creates "erl" and "erlc" in bootstrap/bin which uses the precompiled