aboutsummaryrefslogtreecommitdiffstats
path: root/erts/start_scripts/Makefile
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-09-14 10:24:27 +0200
committerBjörn Gustavsson <[email protected]>2016-09-14 10:24:27 +0200
commit3f8eeea4a291060a25bcc7d6a9f5d09e18cc9aa4 (patch)
tree77fd2e5d662de7437d9421fa5a61bdb994f06469 /erts/start_scripts/Makefile
parent19d6c4e7830ee8513a4b614cbb39862868fc57a1 (diff)
parent176b7c94e4146a65ccd2bd729d58487098dddd9c (diff)
downloadotp-3f8eeea4a291060a25bcc7d6a9f5d09e18cc9aa4.tar.gz
otp-3f8eeea4a291060a25bcc7d6a9f5d09e18cc9aa4.tar.bz2
otp-3f8eeea4a291060a25bcc7d6a9f5d09e18cc9aa4.zip
Merge branch 'maint'
* maint: beam_validator: Handle unreachable instructions Turn off parallel make for start scripts Makefile
Diffstat (limited to 'erts/start_scripts/Makefile')
-rw-r--r--erts/start_scripts/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/start_scripts/Makefile b/erts/start_scripts/Makefile
index dd7e2ea530..ae2521474e 100644
--- a/erts/start_scripts/Makefile
+++ b/erts/start_scripts/Makefile
@@ -17,6 +17,9 @@
#
# %CopyrightEnd%
#
+
+.NOTPARALLEL:
+
include $(ERL_TOP)/make/target.mk
include $(ERL_TOP)/make/$(TARGET)/otp.mk