Merge pull request #167 from NHDaly/julia_cmd_flexibility-v1.1

Fix for julia `v1.1`: allow `Base.julia_cmd()` to contain unexpected flags (adds future-compatibility)

Author: lucatrv

src/static_julia.jl

@@ -211,24 +211,36 @@ function build_julia_cmd(
     # TODO: `startup_file` may be removed in future with `julia-compile`, see: https://github.com/JuliaLang/julia/issues/15864
     startup_file == nothing && (startup_file = "no")
     julia_cmd = `$(Base.julia_cmd())`
-    if length(julia_cmd.exec) != 5 || !all(startswith.(julia_cmd.exec[2:5], ["-C", "-J", "--compile", "--depwarn"]))
-        error("Unexpected format of \"Base.julia_cmd()\", you may be using an incompatible version of Julia:\n$julia_cmd")
+    function get_flag_idx(julia_cmd, flag_str)
+        findfirst(f->(length(f) > length(flag_str) &&
+                      f[1:length(flag_str)]==flag_str), julia_cmd.exec)
     end
-    sysimage == nothing || (julia_cmd.exec[3] = "-J$sysimage")
-    home == nothing || push!(julia_cmd.exec, "-H=$home")
-    startup_file == nothing || push!(julia_cmd.exec, "--startup-file=$startup_file")
-    handle_signals == nothing || push!(julia_cmd.exec, "--handle-signals=$handle_signals")
-    sysimage_native_code == nothing || push!(julia_cmd.exec, "--sysimage-native-code=$sysimage_native_code")
-    compiled_modules == nothing || push!(julia_cmd.exec, "--compiled-modules=$compiled_modules")
-    depwarn == nothing || (julia_cmd.exec[5] = "--depwarn=$depwarn")
-    warn_overwrite == nothing || (julia_cmd.exec[5] = "--warn-overwrite=$warn_overwrite")
-    compile == nothing || (julia_cmd.exec[4] = "--compile=$compile")
-    cpu_target == nothing || (julia_cmd.exec[2] = "-C$cpu_target")
-    optimize == nothing || push!(julia_cmd.exec, "-O$optimize")
-    debug == nothing || push!(julia_cmd.exec, "-g$debug")
-    inline == nothing || push!(julia_cmd.exec, "--inline=$inline")
-    check_bounds == nothing || push!(julia_cmd.exec, "--check-bounds=$check_bounds")
-    math_mode == nothing || push!(julia_cmd.exec, "--math-mode=$math_mode")
+    function set_flag(julia_cmd, flag_str, val)
+        flag_idx = get_flag_idx(julia_cmd, flag_str)
+        if flag_idx != nothing
+            julia_cmd.exec[flag_idx] = "$flag_str$val"
+        else
+            push!(julia_cmd.exec, "$flag_str$val")
+        end
+    end
+    sysimage == nothing || set_flag(julia_cmd, "-J", sysimage)
+    home == nothing || set_flag(julia_cmd, "-H=", home)
+    startup_file == nothing || set_flag(julia_cmd, "--startup-file=", startup_file)
+    handle_signals == nothing || set_flag(julia_cmd, "--handle-signals=", handle_signals)
+    sysimage_native_code == nothing || set_flag(julia_cmd, "--sysimage-native-code=", sysimage_native_code)
+    compiled_modules == nothing || set_flag(julia_cmd, "--compiled-modules=", compiled_modules)
+    depwarn == nothing || set_flag(julia_cmd, "--depwarn=", depwarn)
+    warn_overwrite == nothing || set_flag(julia_cmd, "--warn-overwrite=", warn_overwrite)
+    compile == nothing || set_flag(julia_cmd, "--compile=", compile)
+    cpu_target == nothing || set_flag(julia_cmd, "-C", cpu_target)
+    optimize == nothing || set_flag(julia_cmd, "-O", optimize)
+    debug == nothing || set_flag(julia_cmd, "-g", debug)
+    inline == nothing || set_flag(julia_cmd, "--inline=", inline)
+    check_bounds == nothing || set_flag(julia_cmd, "--check-bounds=", check_bounds)
+    math_mode == nothing || set_flag(julia_cmd, "--math-mode=", math_mode)
+    # Disable incompatible flags
+    set_flag(julia_cmd, "--code-coverage=", "none")
+
     julia_cmd
 end