Auto merge of #107443 - cjgillot:generator-less-query, r=compiler-errors

[rust.git] / tests / run-make / rlib-format-packed-bundled-libs / Makefile

diff --git a/tests/run-make/rlib-format-packed-bundled-libs/Makefile b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
index 0b991ac42e3dc5a634e9848e670adc8be621583b..7fb6ce8d1e4110db9227c636f2e76a1b11a43eb4 100644 (file)
--- a/tests/run-make/rlib-format-packed-bundled-libs/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
@@ -6,7 +6,12 @@
 
 # We're using the llvm-nm instead of the system nm to ensure it is compatible
 # with the LLVM bitcode generated by rustc.
+# Except on Windows where piping/IO redirection under MSYS2 is wonky with llvm-nm.
+ifndef IS_WINDOWS
 NM = "$(LLVM_BIN_DIR)"/llvm-nm
+else
+NM = nm
+endif
 
 all: $(call NATIVE_STATICLIB,native_dep_1) $(call NATIVE_STATICLIB,native_dep_2) $(call NATIVE_STATICLIB,native_dep_3)
        $(RUSTC) rust_dep_up.rs --crate-type=rlib -Zpacked_bundled_libs