Browse Source

Test patching julia-config.jl

pull/57/head
Fredrik Ekre 1 year ago
parent
commit
b70e9ebfc5
No known key found for this signature in database
GPG Key ID: DE82E6D5E364C0A2
  1. 5
      .github/workflows/Compile.yml
  2. 16
      juliac/rpath-private-libs-macos.patch

5
.github/workflows/Compile.yml

@ -27,6 +27,11 @@ jobs: @@ -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: |

16
juliac/rpath-private-libs-macos.patch

@ -0,0 +1,16 @@ @@ -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"
Loading…
Cancel
Save