erts: escript and tools should not read boot file from CWD

Author: frazze-jobb

erts/etc/common/dialyzer.c

@@ -252,7 +252,7 @@ int main(int argc, char** argv)
     }
 
     PUSH("+B");
-    PUSH2("-boot", "no_dot_erlang");
+    PUSH2("-boot", "$ROOT/no_dot_erlang");
     PUSH3("-run", "dialyzer", "plain_cl");
     PUSH("-extra");
 

erts/etc/common/erlc.c

@@ -962,7 +962,7 @@ start_compile_server(char* node_name, char** argv)
     while (strcmp(argv[0], "-mode") != 0) {
         eargv[eargc++] = *argv++;
     }
-    PUSH2("-boot", "no_dot_erlang");
+    PUSH2("-boot", "$ROOT/no_dot_erlang");
     PUSH2("-sname", node_name);
     PUSH2("-setcookie", "erlc_compile_server_cookie");
     PUSH("-hidden");

erts/etc/common/escript.c

@@ -513,7 +513,7 @@ main(int argc, char** argv)
 
     PUSH("+B");
     PUSH("-noshell");
-    PUSH2("-boot", "no_dot_erlang");
+    PUSH2("-boot", "$ROOT/no_dot_erlang");
 
     /*
      * Read options from the %%! row in the script and add them as args

erts/etc/common/typer.c

@@ -179,7 +179,7 @@ main(int argc, char** argv)
     }
 
     PUSH("+B");
-    PUSH2("-boot", "no_dot_erlang");
+    PUSH2("-boot", "$ROOT/no_dot_erlang");
     PUSH3("-run", "typer", "start");
     PUSH("-extra");
 

erts/preloaded/ebin/init.beam

@@ -1259,7 +1259,10 @@ path_flags(Flags) ->
     {bs2ss(Pa),bs2ss(Pz)}.
 
 get_boot(BootFile0,Root) ->
-    BootFile = BootFile0 ++ ".boot",
+    BootFile = case BootFile0 of
+        "$ROOT/" ++ BootFile1 -> Root ++ "/bin/" ++ BootFile1 ++ ".boot";
+        _ -> BootFile0 ++ ".boot"
+    end,
 
     case get_boot(BootFile) of
 	{ok, CmdList} ->