.github/workflows/main.yml

@@ -53,7 +53,7 @@ jobs:
 
     env: ${{ matrix.env || fromJSON('{}') }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: ./.github/actions/checkout
@@ -65,7 +65,7 @@ jobs:
       # Bump the prefix number to evict all previous caches and enforce a clean
       # build, in the unlikely case that some weird build error occur and ccache
       # becomes a potential suspect.
-      - uses: actions/cache@v5
+      - uses: actions/cache@v4
         id: cache-restore
         with:
           path: ${{ runner.tool_cache }}/ccache
@@ -125,7 +125,7 @@ jobs:
       # Upload the `dist` folder from the build as the artifacts for this
       # runner.
       - name: Upload artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format( 'dist-{0}', matrix.artifact) }}
           path: build/dist
@@ -149,7 +149,7 @@ jobs:
       # time instead of having to recreate everything each time a failure
       # happens.
       - if: always() && steps.cache-restore.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v5
+        uses: actions/cache/save@v4
         with:
           path: ${{ runner.tool_cache }}/ccache
           key: 0-cache-${{ matrix.artifact }}-${{ github.run_id }}
@@ -164,7 +164,7 @@ jobs:
           - name: exceptions
             defines: -DWASI_SDK_EXCEPTIONS=ON
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: ./.github/actions/checkout
@@ -191,16 +191,16 @@ jobs:
     needs: build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: ./.github/actions/checkout
 
       # Download all artifacts from all platforms in `build`, merge them into
       # final wasi-sdk-* artifacts, and then upload them.
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v4
       - run: ./ci/merge-artifacts.sh
-      - uses: actions/upload-artifact@v6
+      - uses: actions/upload-artifact@v4
         with:
           name: release-artifacts
           path: dist
@@ -251,12 +251,12 @@ jobs:
     needs: build
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: ./.github/actions/checkout
       - uses: ./.github/actions/install-deps
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v4
         with:
           name: dist-x86_64-linux
           path: dist-x86_64-linux

cmake/wasi-sdk-toolchain.cmake

@@ -113,9 +113,6 @@ if(WASI_SDK_LLDB)
     include(ProcessorCount)
     ProcessorCount(nproc)
     find_program(MAKE_EXECUTABLE make REQUIRED)
-    if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-      set(libedit_ldflags -Wl,-install_name,@rpath/libedit.0.dylib)
-    endif()
     ExternalProject_Add(libedit
       URL https://thrysoee.dk/editline/libedit-20251016-3.1.tar.gz
       URL_HASH SHA256=21362b00653bbfc1c71f71a7578da66b5b5203559d43134d2dd7719e313ce041
@@ -130,7 +127,8 @@ if(WASI_SDK_LLDB)
           --enable-pic
           --disable-examples
           CC=${CMAKE_C_COMPILER}
-          LDFLAGS=${libedit_ldflags}
+          CFLAGS=${libedit_cflags}
+          LDFLAGS=${libedit_cflags}
       BUILD_COMMAND
         ${MAKE_EXECUTABLE} -j${nproc} V=1
 
@@ -171,9 +169,6 @@ ExternalProject_Add(llvm-build
     # Pass `-s` to strip symbols by default and shrink the size of the
     # distribution
     -DCMAKE_EXE_LINKER_FLAGS=-s
-    # Looks to be required on macOS for, at build time, the dynamic linker to
-    # find `libedit.dylib` when that's enabled.
-    -DCMAKE_BUILD_RPATH=${wasi_tmp_install}/lib
     ${llvm_cmake_flags_list}
   # See https://www.scivision.dev/cmake-externalproject-list-arguments/ for
   # why this is in `CMAKE_CACHE_ARGS` instead of above