.

JuliaLang · Apr 7, 2017 · 3b56638 · 3b56638
1 parent 3dcbc7d
commit 3b56638
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/contrib/julia-config.jl b/contrib/julia-config.jl
@@ -23,6 +23,8 @@ function libDir()
     end
 end
 
+private_libDir() = joinpath(libDir(), "julia")
+
 function includeDir()
     joinpath(match(r"(.*)(bin)",JULIA_HOME).captures[1],"include","julia")
 end
@@ -59,7 +61,7 @@ function ldlibs()
         "julia"
     end
     if is_unix()
-        return replace("""-Wl,-rpath,$(libDir()) -l$libname""","\\","\\\\")
+        return replace("""-Wl,-rpath,$(libDir()) -Wl,-rpath,$(private_libDir()) -l$libname""","\\","\\\\")
     else
         return "-l$libname -lopenlibm"
     end

diff --git a/test/embedding.jl b/test/embedding.jl
@@ -1,6 +1,7 @@
 # test that the embedding example runs without error
 let
-    embedding_bin = joinpath(JULIA_HOME,"..","libexec","embedding")
+    exename = "embedding" * (is_windows() ? ".exe" : "")
+    embedding_bin = joinpath(JULIA_HOME,"..","libexec",exename)
     lines = readlines(pipeline(`$(embedding_bin)`,
                                stderr=DevNull))
     @test length(lines) == 5