Fix overriding the --launcher option

eregon · eregon · commit e05090875a04 · 2019-04-02T16:48:30.000+02:00
diff --git a/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java b/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java
@@ -241,7 +241,7 @@ private static void debugPreInitialization() {
     }
 
     private Context createContext(Context.Builder builder, CommandLineOptions config) {
-        if (isAOT()) {
+        if (isAOT() && !config.isSetInPolyglotOptions(OptionsCatalog.LAUNCHER.getName())) {
             final String launcher = ProcessProperties.getExecutableName();
             builder.option(OptionsCatalog.LAUNCHER.getName(), launcher);
         }

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ private static void debugPreInitialization() {`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`private Context createContext(Context.Builder builder, CommandLineOptions config) {`
`244`		`- if (isAOT()) {`
	`244`	`+ if (isAOT() && !config.isSetInPolyglotOptions(OptionsCatalog.LAUNCHER.getName())) {`
`245`	`245`	`final String launcher = ProcessProperties.getExecutableName();`
`246`	`246`	`builder.option(OptionsCatalog.LAUNCHER.getName(), launcher);`
`247`	`247`	`}`