Make the use of RPATH conditional

MacOS ld doesn't support -rpath, so we must be able to not use it there.

diff --git a/.github/before_script.sh b/.github/before_script.sh
index 003a9a63c20a0320f1b6d83f468d6914abb55df6..2164d7f7f897079b671713d5bd8cd1ba37944c09 100755 (executable)
--- a/.github/before_script.sh
+++ b/.github/before_script.sh
@@ -17,7 +17,7 @@ git describe --always --long
 
 PREFIX=$HOME/opt
 
-${SETARCH-} ./config shared -d --prefix=$PREFIX --libdir=lib --openssldir=$PREFIX -Wl,-rpath=$PREFIX/lib
+${SETARCH-} ./config shared -d --prefix=$PREFIX --libdir=lib --openssldir=$PREFIX ${USE_RPATH:+-Wl,-rpath=$PREFIX/lib}
 ${SETARCH-} make -s -j$(nproc) build_libs
 ${SETARCH-} make -s -j$(nproc) build_programs
 make -s install_sw

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1267957eb224f9f14bf3eabad4847025ed2d13d3..0a7e9a691d63ce413673626aee201ac55da4b5fe 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ on: [push, pull_request]
 
 env:
     OPENSSL_BRANCH: openssl-3.0.0-beta2
+    USE_RPATH: yes
 
 jobs:
     gcc-openssl-stable:
@@ -23,6 +24,8 @@ jobs:
 
     macos-openssl-stable:
         runs-on: macos-11
+        env:
+            USE_RPATH:
         steps:
             - uses: actions/checkout@v2
             - run: .github/before_script.sh
@@ -41,6 +44,7 @@ jobs:
         runs-on: macos-11
         env:
             OPENSSL_BRANCH: master
+            USE_RPATH:
         steps:
             - uses: actions/checkout@v2
             - run: .github/before_script.sh
@@ -61,6 +65,7 @@ jobs:
         env:
             OPENSSL_BRANCH: master
             ASAN: -DASAN=1
+            USE_RPATH:
         steps:
             - uses: actions/checkout@v2
             - run: .github/before_script.sh