From 4b8a8d241d6c078eb8532cff8b8a43d11dc62500 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Fri, 22 Oct 2021 12:24:42 +0200 Subject: [PATCH] chore: CI: no more need for binary patching --- .github/workflows/ci.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d8deaab0c..dc5723cde3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,22 +119,11 @@ jobs: # contortion to support empty OPTIONS with old macOS bash cmake .. ${{ matrix.CMAKE_OPTIONS }} ${OPTIONS[@]+"${OPTIONS[@]}"} make -j4 - # de-Nix-ify binaries - - name: Patch + - name: Check binaries if: matrix.name == 'Linux release' run: | - cd build/stage1 - for f in lib/lean/libleanshared.so bin/lean bin/leanpkg bin/leanc bin/lake; do - cp -n $(ldd "$f" | cut -f3 -d' ' | grep -Ev 'libc|lean') lib/ || true - if [[ "$f" == bin/* ]]; then - patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 --set-rpath '$ORIGIN/../lib:$ORIGIN/../lib/lean' $f - else - # library: use executable RPATH - patchelf --remove-rpath $f - fi - ldd $f - done - ls -l lib/ + ldd -v build/stage1/bin/* || true + ls -l build/stage1/lib/ - name: Patch if: matrix.name == 'macOS' run: |