diff options
| author | Dan Gudmundsson <[email protected]> | 2017-10-17 08:12:41 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-10-17 08:12:41 +0200 |
| commit | 11fcc4b2b4581da4e24b94128a4f38ae98a2f466 (patch) | |
| tree | c1becd60ffb088d0d21b83e9f24854ec6447bef1 /erts/etc | |
| parent | 34b3ee1079890f523062b5d5613187f413871538 (diff) | |
| parent | baf53defc90c4aa8a4caa6b2c6ead6a1b58df199 (diff) | |
| download | otp-11fcc4b2b4581da4e24b94128a4f38ae98a2f466.tar.gz otp-11fcc4b2b4581da4e24b94128a4f38ae98a2f466.tar.bz2 otp-11fcc4b2b4581da4e24b94128a4f38ae98a2f466.zip | |
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
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/dialyzer.c | 2 | ||||
| -rw-r--r-- | erts/etc/common/erlc.c | 2 | ||||
| -rw-r--r-- | erts/etc/common/escript.c | 2 | ||||
| -rw-r--r-- | erts/etc/common/typer.c | 2 |
4 files changed, 4 insertions, 4 deletions
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"); |