Browse Source

Use julia nightly for static compilation CI (#64)

pull/66/head
Fredrik Ekre 1 year ago committed by GitHub
parent
commit
78ee7fbe26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 12
      .github/workflows/Compile.yml
  2. 16
      juliac/rpath-private-libs-macos.patch

12
.github/workflows/Compile.yml

@ -21,17 +21,9 @@ jobs:
- macOS-latest - macOS-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
# - uses: julia-actions/setup-julia@v2 - uses: julia-actions/setup-julia@v2
# with:
# version: 'nightly'
- uses: julia-actions/install-juliaup@v2
with: with:
channel: 'pr55047' # https://github.com/JuliaLang/julia/pull/55047 version: 'nightly'
- 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 - uses: julia-actions/cache@v2
- name: Compile Runic with juliac - name: Compile Runic with juliac
run: | run: |

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

@ -1,16 +0,0 @@
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