aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2017-09-26 15:32:56 +0200
committerDan Gudmundsson <[email protected]>2017-09-27 16:02:15 +0200
commitee0da31d00a7bd3375b66cf905cb2811d868f21b (patch)
treeec85133b73bfcca503ba4b27d293349b91f1c389
parent73500d2a456023ca36172f5af896d0b1f10853b7 (diff)
downloadotp-ee0da31d00a7bd3375b66cf905cb2811d868f21b.tar.gz
otp-ee0da31d00a7bd3375b66cf905cb2811d868f21b.tar.bz2
otp-ee0da31d00a7bd3375b66cf905cb2811d868f21b.zip
Enable usage of no_dot_erlang in bootstrap
-rw-r--r--bootstrap/bin/no_dot_erlang.bootbin0 -> 5555 bytes
-rw-r--r--erts/start_scripts/Makefile5
2 files changed, 4 insertions, 1 deletions
diff --git a/bootstrap/bin/no_dot_erlang.boot b/bootstrap/bin/no_dot_erlang.boot
new file mode 100644
index 0000000000..e259dc6ffd
--- /dev/null
+++ b/bootstrap/bin/no_dot_erlang.boot
Binary files differ
diff --git a/erts/start_scripts/Makefile b/erts/start_scripts/Makefile
index 20fea99016..e730422ed8 100644
--- a/erts/start_scripts/Makefile
+++ b/erts/start_scripts/Makefile
@@ -171,7 +171,6 @@ $(ERL_TOP)/bin/no_dot_erlang.script:
$(ERLC) $(SCRIPT_PATH) +no_warn_sasl +otp_build +no_dot_erlang -o $@ $(SS_ROOT)/no_dot_erlang.rel )
## Special target used from system/build/Makefile for source code release bootstrap.
-## Add no_dot_erlang after next release
bootstrap_scripts: $(SS_ROOT)/start_clean.rel
$(V_at)$(INSTALL_DIR) $(TESTROOT)/bin
$(V_at)$(INSTALL_DIR) $(SS_TMP)
@@ -181,6 +180,10 @@ bootstrap_scripts: $(SS_ROOT)/start_clean.rel
$(V_at)( cd $(SS_TMP) && \
$(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +otp_build +no_module_tests \
-o $(TESTROOT)/bin/start_clean.script $(SS_ROOT)/start_clean.rel )
+ $(V_at)( cd $(SS_TMP) && \
+ $(ERLC) $(BOOTSTRAP_SCRIPT_PATH) +otp_build +no_module_tests \
+ -o $(TESTROOT)/bin/no_dot_erlang.script $(SS_ROOT)/no_dot_erlang.rel )
+
clean:
$(V_at)$(RM) $(REL_SCRIPTS) $(INSTALL_SCRIPTS)