Fixes for 1.10 (#762)

Fixes #761

Author: IanButterworth

docs/src/devdocs/binaries_part_2.md

@@ -175,11 +175,16 @@ int main(int argc, char *argv[])
     jl_set_ARGS(argc, argv);
 
     // Set PROGRAM_FILE to argv[0].
-#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 9
-    jl_binding_t *bp = jl_get_binding_wr(jl_base_module, jl_symbol("PROGRAM_FILE"), 1);
-    jl_checked_assignment(bp, (jl_value_t*)jl_cstr_to_string(argv[0]));
+    jl_sym_t *var = jl_symbol("PROGRAM_FILE");
+    jl_value_t *val = jl_cstr_to_string(argv[0]);
+#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 10
+    jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var);
+    jl_checked_assignment(bp, jl_base_module, var, val);
+#elif JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 9
+    jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var, 1);
+    jl_checked_assignment(bp, val);
 #else
-    jl_set_global(jl_base_module, jl_symbol("PROGRAM_FILE"), (jl_value_t*)jl_cstr_to_string(argv[0]));    
+    jl_set_global(jl_base_module, var, val);
 #endif
 
     // Set Base.ARGS to `String[ unsafe_string(argv[i]) for i = 1:argc ]`

src/embedding_wrapper.c

@@ -104,11 +104,15 @@ int main(int argc, char *argv[]) {
     checked_eval_string("append!(empty!(Base.ARGS), Core.ARGS)");
     jl_value_t *firstarg = checked_eval_string("popfirst!(ARGS)");
     JL_GC_PUSH1(&firstarg);
-#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 9
-    jl_binding_t *bp = jl_get_binding_wr(jl_base_module, jl_symbol("PROGRAM_FILE"), 1);
+    jl_sym_t *var = jl_symbol("PROGRAM_FILE");
+#if JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 10
+    jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var);
+    jl_checked_assignment(bp, jl_base_module, var, firstarg);
+#elif JULIA_VERSION_MAJOR == 1 && JULIA_VERSION_MINOR >= 9
+    jl_binding_t *bp = jl_get_binding_wr(jl_base_module, var, 1);
     jl_checked_assignment(bp, firstarg);
 #else
-    jl_set_global(jl_base_module, jl_symbol("PROGRAM_FILE"), firstarg);    
+    jl_set_global(jl_base_module, jl_symbol("PROGRAM_FILE"), firstarg);
 #endif
     JL_GC_POP();