X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=tests%2Frun-make%2Frlib-format-packed-bundled-libs%2FMakefile;h=7fb6ce8d1e4110db9227c636f2e76a1b11a43eb4;hb=dc3e59cb3fe05ebd752d3a2269f501c00327be22;hp=0b991ac42e3dc5a634e9848e670adc8be621583b;hpb=44a500c8c187b245638684748f54bd6ec67e0b25;p=rust.git

diff --git a/tests/run-make/rlib-format-packed-bundled-libs/Makefile b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
index 0b991ac42e3..7fb6ce8d1e4 100644
--- 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