about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAntoni Boucher <bouanto@zoho.com>2025-06-13 16:38:25 -0400
committerAntoni Boucher <bouanto@zoho.com>2025-06-13 20:22:55 -0400
commit033fa352272864e2cd625a07b48e9d536b204036 (patch)
tree5d114a9d68d2510ddb162c69b8af3a6c2b0daa67
parent3812cf454d81831de8de73b1f7010b5067b00e5a (diff)
downloadrust-033fa352272864e2cd625a07b48e9d536b204036.tar.gz
rust-033fa352272864e2cd625a07b48e9d536b204036.zip
Fix for run-make tests
-rw-r--r--.github/workflows/ci.yml6
-rw-r--r--.github/workflows/release.yml6
2 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e6840e916e..53ecdfac3d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,8 @@ permissions:
 env:
   # Enable backtraces for easier debugging
   RUST_BACKTRACE: 1
+  # For the run-make tests.
+  LLVM_BIN_DIR: /usr/bin
 
 jobs:
   build:
@@ -48,7 +50,9 @@ jobs:
 
     - name: Install packages
       # `llvm-14-tools` is needed to install the `FileCheck` binary which is used for asm tests.
-      run: sudo apt-get install ninja-build ripgrep llvm-14-tools
+      run: sudo apt-get install ninja-build ripgrep llvm-14-tools llvm libstdc++6
+
+    - run: find / -name libstdc++.so | true
 
     - name: Install rustfmt & clippy
       run: rustup component add rustfmt clippy
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b9c385b4231..dc8543d0a52 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,6 +12,8 @@ permissions:
 env:
   # Enable backtraces for easier debugging
   RUST_BACKTRACE: 1
+  # For the run-make tests.
+  LLVM_BIN_DIR: /usr/bin
 
 jobs:
   build:
@@ -36,7 +38,7 @@ jobs:
       uses: Swatinem/rust-cache@v2
 
     - name: Install packages
-      run: sudo apt-get install ninja-build ripgrep
+      run: sudo apt-get install ninja-build ripgrep llvm libstdc++6
 
     - name: Download artifact
       run: curl -LO https://github.com/rust-lang/gcc/releases/latest/download/gcc-15.deb
@@ -49,8 +51,6 @@ jobs:
     - name: Set env
       run: |
         echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV
-        
-        
 
     - name: Build
       run: |