Skip to content

Commit 66f382e

Browse files
committed
allow -CC and -LD despite environment arguments
1 parent 52d12f5 commit 66f382e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public static void main(String[] args) {
7878
@Override
7979
protected List<String> preprocessArguments(List<String> givenArgs, Map<String, String> polyglotOptions) {
8080
ArrayList<String> unrecognized = new ArrayList<>();
81-
ArrayList<String> inputArgs = new ArrayList<>(getDefaultEnvironmentArgs());
81+
List<String> defaultEnvironmentArgs = getDefaultEnvironmentArgs();
82+
ArrayList<String> inputArgs = new ArrayList<>(defaultEnvironmentArgs);
8283
inputArgs.addAll(givenArgs);
8384
givenArguments = new ArrayList<>(inputArgs);
8485
List<String> arguments = new ArrayList<>(inputArgs);
@@ -142,15 +143,15 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
142143
versionAction = VersionAction.PrintAndContinue;
143144
break;
144145
case "-CC":
145-
if (i != 0) {
146-
throw new IllegalArgumentException("-CC must be the first argument");
146+
if (i != defaultEnvironmentArgs.size()) {
147+
throw new IllegalArgumentException("-CC must be the first given argument");
147148
}
148149
GraalPythonCC.main(arguments.subList(i + 1, arguments.size()).toArray(new String[0]));
149150
System.exit(0);
150151
break;
151152
case "-LD":
152-
if (i != 0) {
153-
throw new IllegalArgumentException("-LD must be the first argument");
153+
if (i != defaultEnvironmentArgs.size()) {
154+
throw new IllegalArgumentException("-LD must be the first given argument");
154155
}
155156
GraalPythonLD.main(arguments.subList(i + 1, arguments.size()).toArray(new String[0]));
156157
System.exit(0);

0 commit comments

Comments
 (0)