Merge pull request #454 from schmrlng/system_header_overrides

Move user override for standard headers to take precedence over all others
JuliaInterop · Dec 30, 2019 · 14c403a · 14c403a · Gnimuc · Jan 27, 2020
2 parents f7ab072 + 63bfb5b
commit 14c403a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/initialization.jl b/src/initialization.jl
@@ -383,10 +383,10 @@ function collectClangHeaders!(headers)
 end
 
 function collectAllHeaders!(headers, nostdcxx)
-    nostdcxx || collectStdHeaders!(headers)
     for header in split(get(ENV, "CXXJL_HEADER_DIRS", ""), ":")
         isempty(header) || push!(headers, (header, C_System))
     end
+    nostdcxx || collectStdHeaders!(headers)
     collectClangHeaders!(headers)
     headers
 end