debug

Author: tgross35

ci/run.sh

@@ -47,40 +47,7 @@ else
     fi
 fi
 
-PREFIX=${target//unknown-/}-
-case "$target" in
-    armv7-*)
-        PREFIX=arm-linux-gnueabihf-
-        ;;
-    thumb*)
-        PREFIX=arm-none-eabi-
-        ;;
-    *86*-*)
-        PREFIX=
-        ;;
-esac
-
-cat << "EOF" > run-rust-nm
-#!/bin/bash
-
-set -x
-
-NM=$(find "$(rustc --print sysroot)" \( -name llvm-nm -o -name llvm-nm.exe \) )
-if [ "$NM" = "" ]; then
-  NM="${PREFIX}nm"
-fi
-
-# i686-pc-windows-gnu tools have a dependency on some DLLs, so run it with
-# rustup run to ensure that those are in PATH.
-TOOLCHAIN="$(rustup show active-toolchain | sed 's/ (default)//')"
-if [[ "$TOOLCHAIN" == *i686-pc-windows-gnu ]]; then
-  NM="rustup run $TOOLCHAIN $NM"
-fi
-
-$NM "$@""
-EOF
-
-chmod +x run-rust-nm
+export TARGET="$target"
 
 symcheck=(cargo run -p symbol-check)
 [[ "$target" = "wasm"* ]] && symcheck+=(--features wasm)

crates/symbol-check/src/main.rs

@@ -169,7 +169,8 @@ fn verify_no_duplicates(path: impl AsRef<Path>) {
     if !dups.is_empty() {
         dups.sort_unstable_by(|a, b| a.name.cmp(&b.name));
 
-        Command::new("run-rust-nm")
+        Command::new("./run-rust-nm")
+            .arg(std::env::var("TARGET").unwrap())
             .arg(path.as_ref())
             .status()
             .unwrap();

run-rust-nm

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -x
+
+target="$1"
+shift
+
+PREFIX=${target//unknown-/}-
+case "$target" in
+    armv7-*)
+        PREFIX=arm-linux-gnueabihf-
+        ;;
+    thumb*)
+        PREFIX=arm-none-eabi-
+        ;;
+    *86*-*)
+        PREFIX=
+        ;;
+esac
+
+NM=$(find "$(rustc --print sysroot)" \( -name llvm-nm -o -name llvm-nm.exe \) )
+if [ "$NM" = "" ]; then
+  NM="${PREFIX}nm"
+fi
+
+# i686-pc-windows-gnu tools have a dependency on some DLLs, so run it with
+# rustup run to ensure that those are in PATH.
+TOOLCHAIN="$(rustup show active-toolchain | sed 's/ (default)//')"
+if [[ "$TOOLCHAIN" == *i686-pc-windows-gnu ]]; then
+  NM="rustup run $TOOLCHAIN $NM"
+fi
+
+$NM "$@"