Remove libdir from pkgimage link invocation.

JuliaLang · Oct 18, 2023 · 3d7bce2 · 3d7bce2
1 parent 2a51b7f
commit 3d7bce2
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/base/linking.jl b/base/linking.jl
@@ -141,7 +141,6 @@ else
 end
 
 is_debug() = ccall(:jl_is_debugbuild, Cint, ()) == 1
-libdir() = abspath(Sys.BINDIR, Base.LIBDIR)
 private_libdir() = abspath(Sys.BINDIR, Base.PRIVATE_LIBDIR)
 if Sys.iswindows()
     shlibdir() = Sys.BINDIR
@@ -150,7 +149,6 @@ else
 end
 
 function link_image_cmd(path, out)
-    LIBDIR = "-L$(libdir())"
     PRIVATE_LIBDIR = "-L$(private_libdir())"
     SHLIBDIR = "-L$(shlibdir())"
     LIBS = is_debug() ? ("-ljulia-debug", "-ljulia-internal-debug") :
@@ -160,7 +158,7 @@ function link_image_cmd(path, out)
     end
 
     V = VERBOSE[] ? "--verbose" : ""
-    `$(ld()) $V $SHARED -o $out $WHOLE_ARCHIVE $path $NO_WHOLE_ARCHIVE $LIBDIR $PRIVATE_LIBDIR $SHLIBDIR $LIBS`
+    `$(ld()) $V $SHARED -o $out $WHOLE_ARCHIVE $path $NO_WHOLE_ARCHIVE $PRIVATE_LIBDIR $SHLIBDIR $LIBS`
 end
 
 function link_image(path, out, internal_stderr::IO=stderr, internal_stdout::IO=stdout)