From b70e9ebfc58502152ebf1e8ac803240b34aeab54 Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Thu, 5 Sep 2024 11:41:51 +0200 Subject: [PATCH] Test patching julia-config.jl --- .github/workflows/Compile.yml | 5 +++++ juliac/rpath-private-libs-macos.patch | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 juliac/rpath-private-libs-macos.patch diff --git a/.github/workflows/Compile.yml b/.github/workflows/Compile.yml index b2785d0..00f332e 100644 --- a/.github/workflows/Compile.yml +++ b/.github/workflows/Compile.yml @@ -27,6 +27,11 @@ jobs: - uses: julia-actions/install-juliaup@v2 with: channel: 'pr55047' # https://github.com/JuliaLang/julia/pull/55047 + - name: Patch julia-config.jl + run: | + juliaconfig=$(julia -e 'print(joinpath(Sys.BINDIR, Base.DATAROOTDIR,"julia", "julia-config.jl"))') + patch -p1 "${juliaconfig}" juliac/rpath-private-libs-macos.patch + if: ${{ matrix.os == 'macOS-latest' }} - uses: julia-actions/cache@v2 - name: Compile Runic with juliac run: | diff --git a/juliac/rpath-private-libs-macos.patch b/juliac/rpath-private-libs-macos.patch new file mode 100644 index 0000000..f5c5e85 --- /dev/null +++ b/juliac/rpath-private-libs-macos.patch @@ -0,0 +1,16 @@ +diff --git a/contrib/julia-config.jl b/contrib/julia-config.jl +index 55996e9fe5..8725b08eba 100755 +--- a/contrib/julia-config.jl ++++ b/contrib/julia-config.jl +@@ -67,8 +67,9 @@ function ldlibs(doframework) + "julia" + end + if Sys.isunix() +- return "-L$(shell_escape(private_libDir())) " * "-Wl,-rpath,$(shell_escape(libDir())) " * +- (Sys.isapple() ? string() : "-Wl,-rpath,$(shell_escape(private_libDir())) ") * ++ return "-L$(shell_escape(private_libDir())) " * ++ "-Wl,-rpath,$(shell_escape(libDir())) " * ++ "-Wl,-rpath,$(shell_escape(private_libDir())) " * + "-l$libname" + else + return "-l$libname -lopenlibm"