Merge branch 'dgud/dot_erlang/OTP-14439'

* dgud/dot_erlang/OTP-14439:
  fixup! Do not load .erlang from current dir
  erlc: Do not load .erlang
  escript: Do not load .erlang
  dialyzer: Do not load .erlang
  reltool: Add no_dot_erlang bootfiles
  Enable usage of no_dot_erlang in bootstrap
  Do not load .erlang from current dir

6 files changed, 9 insertions, 8 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 6f6eca2a0b..bd824b3405 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -1641,9 +1641,7 @@
       <tag>The <c>.erlang</c> startup file</tag>
       <item>
         <p>When Erlang/OTP is started, the system searches for a file named
-          <c>.erlang</c> in the directory where Erlang/OTP is started. If not
-          found, the user's home directory is searched for an <c>.erlang</c>
-          file.</p>
+        <c>.erlang</c> in the user's home directory.</p>
         <p>If an <c>.erlang</c> file is found, it is assumed to contain valid
           Erlang expressions. These expressions are evaluated as if they were
           input to the shell.</p>
diff --git a/erts/etc/common/dialyzer.c b/erts/etc/common/dialyzer.c
index 0e74eb065b..b45d5c7ca7 100644
--- a/erts/etc/common/dialyzer.c
+++ b/erts/etc/common/dialyzer.c
@@ -255,7 +255,7 @@ int main(int argc, char** argv)
     }
 
     PUSH("+B");
-    PUSH2("-boot", "start_clean");
+    PUSH2("-boot", "no_dot_erlang");
     PUSH3("-run", "dialyzer", "plain_cl");
     PUSH("-extra");
 
diff --git a/erts/etc/common/erlc.c b/erts/etc/common/erlc.c
index 8cfd98bcc4..aa99c69100 100644
--- a/erts/etc/common/erlc.c
+++ b/erts/etc/common/erlc.c
@@ -234,7 +234,7 @@ int main(int argc, char** argv)
     PUSH("+A0");
     PUSH("-noinput");
     PUSH2("-mode", "minimal");
-    PUSH2("-boot", "start_clean");
+    PUSH2("-boot", "no_dot_erlang");
     PUSH3("-s", "erl_compile", "compile_cmdline");
     PUSH("-extra");
 
diff --git a/erts/etc/common/escript.c b/erts/etc/common/escript.c
index 8241675200..d739d21f12 100644
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
@@ -521,7 +521,7 @@ main(int argc, char** argv)
     free_env_val(env);
 
     PUSH("+B");
-    PUSH2("-boot", "start_clean");
+    PUSH2("-boot", "no_dot_erlang");
     PUSH("-noshell");
 
     /*
diff --git a/erts/etc/common/typer.c b/erts/etc/common/typer.c
index b64cbb4a92..f13135d883 100644
--- a/erts/etc/common/typer.c
+++ b/erts/etc/common/typer.c
@@ -177,7 +177,7 @@ main(int argc, char** argv)
     }
 
     PUSH("+B");
-    PUSH2("-boot", "start_clean");
+    PUSH2("-boot", "no_dot_erlang");
     PUSH3("-run", "typer", "start");
     PUSH("-extra");
 
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)