sysimg.jl: load osutils.jl before c.jl

JuliaLang · Feb 19, 2016 · 11225d1 · 11225d1
1 parent 0f9723c
commit 11225d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/base/c.jl b/base/c.jl
@@ -4,8 +4,6 @@
 
 import Core.Intrinsics: cglobal, box
 
-const OS_NAME = ccall(:jl_get_OS_NAME, Any, ())
-
 cfunction(f::Function, r, a) = ccall(:jl_function_ptr, Ptr{Void}, (Any, Any, Any), f, r, a)
 
 if ccall(:jl_is_char_signed, Any, ())

diff --git a/base/osutils.jl b/base/osutils.jl
@@ -1,5 +1,7 @@
 # This file is a part of Julia. License is MIT: http://julialang.org/license
 
+const OS_NAME = ccall(:jl_get_OS_NAME, Any, ())
+
 function is_unix(os::Symbol)
     if (os==:Windows) return false;
     elseif (os==:Linux) return true;

diff --git a/base/sysimg.jl b/base/sysimg.jl
@@ -107,8 +107,8 @@ include("iterator.jl")
 # For OS specific stuff
 include(UTF8String(vcat(length(Core.ARGS)>=2?Core.ARGS[2].data:"".data, "build_h.jl".data))) # include($BUILDROOT/base/build_h.jl)
 include(UTF8String(vcat(length(Core.ARGS)>=2?Core.ARGS[2].data:"".data, "version_git.jl".data))) # include($BUILDROOT/base/version_git.jl)
-include("c.jl")
 include("osutils.jl")
+include("c.jl")
 
 # Core I/O
 include("io.jl")