Try to fix i686-pc-windows-gnu

dpaoliello · dpaoliello · commit 424237207d68 · 2024-03-27T14:50:45.000-07:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -97,7 +97,7 @@ jobs:
       shell: bash
 
     # Non-linux tests just use our raw script
-    - run: ./ci/run.sh ${{ matrix.target }}
+    - run: ./ci/run.sh ${{ matrix.target }} ${{ matrix.rust }}
       if: matrix.os != 'ubuntu-latest'
       shell: bash
 
diff --git a/ci/run.sh b/ci/run.sh
@@ -45,6 +45,8 @@ esac
 NM=$(find $(rustc --print sysroot) \( -name llvm-nm -o -name llvm-nm.exe \) )
 if [ "$NM" = "" ]; then
   NM=${PREFIX}nm
+elif [ -n "$2" ]; then
+  NM="rustup run $2 $NM"
 fi
 
 # Look out for duplicated symbols when we include the compiler-rt (C) implementation

-Original file line number
+Diff line change
 NM=$(find $(rustc --print sysroot) \( -name llvm-nm -o -name llvm-nm.exe \) )
 if [ "$NM" = "" ]; then
   NM=${PREFIX}nm
 +elif [ -n "$2" ]; then
 +  NM="rustup run $2 $NM"Collapse commentComment on line R49
RalfJung commented on Mar 28, 2024 
RalfJung
on Mar 28, 2024
Member
Might be worth a comment saying this is needed on i686-windows-gnu to pick up some shared libraries.
Code has comments. Press enter to view.
 fi
 # Look out for duplicated symbols when we include the compiler-rt (C) implementation