add core library paths to relaunch args

timfel · timfel · commit 4929e7d3c08e · 2019-09-28T15:06:48.000+02:00
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -227,7 +227,10 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                             arguments.add(i + 1 + j, "-" + optionChar);
                         }
                     } else {
-                        if (arg.startsWith("--llvm.")) {
+                        if (arg.startsWith("--llvm.") ||
+                                        arg.startsWith("--python.CoreHome") ||
+                                        arg.startsWith("--python.StdLibHome") ||
+                                        arg.startsWith("--python.CAPI")) {
                             addRelaunchArg(arg);
                         }
                         // possibly a polyglot argument

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,10 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S`
`227`	`227`	`arguments.add(i + 1 + j, "-" + optionChar);`
`228`	`228`	`}`
`229`	`229`	`} else {`
`230`		`- if (arg.startsWith("--llvm.")) {`
	`230`	`+ if (arg.startsWith("--llvm.") \|\|`
	`231`	`+ arg.startsWith("--python.CoreHome") \|\|`
	`232`	`+ arg.startsWith("--python.StdLibHome") \|\|`
	`233`	`+ arg.startsWith("--python.CAPI")) {`
`231`	`234`	`addRelaunchArg(arg);`
`232`	`235`	`}`
`233`	`236`	`// possibly a polyglot argument`