Auto merge of #107738 - matthiaskrgr:rollup-o18lzi8, r=matthiaskrgr

[rust.git] / tests / run-make / raw-dylib-inline-cross-dylib / Makefile

diff --git a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
index 9e603f95835986a8a9a9641145e2a56b1ce0acf3..722a49b02cb3bc499d8da6512e3f7a1a7a91babb 100644 (file)
--- a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
@@ -4,15 +4,19 @@
 
 include ../../run-make-fulldeps/tools.mk
 
+# We'd be using the llvm-objdump instead of the system objdump to ensure compatibility
+# with the LLVM bitcode generated by rustc but on Windows  piping/IO redirection under MSYS2 is wonky with llvm-objdump.
+OBJDUMP = objdump
+
 all:
        $(RUSTC) --crate-type dylib --crate-name raw_dylib_test lib.rs -C prefer-dynamic
        $(RUSTC) --crate-type dylib --crate-name raw_dylib_test_wrapper lib_wrapper.rs -C prefer-dynamic
        $(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)" -C prefer-dynamic
        # Make sure we don't find an import to the functions we expect to be inlined.
-       "$(LLVM_BIN_DIR)"/llvm-objdump -p $(TMPDIR)/driver.exe | $(CGREP) -v -e "inline_library_function"
-       "$(LLVM_BIN_DIR)"/llvm-objdump -p $(TMPDIR)/driver.exe | $(CGREP) -v -e "inline_library_function_calls_inline"
+       $(OBJDUMP) -p $(TMPDIR)/driver.exe | $(CGREP) -v -e "inline_library_function"
+       $(OBJDUMP) -p $(TMPDIR)/driver.exe | $(CGREP) -v -e "inline_library_function_calls_inline"
        # Make sure we do find an import to the functions we expect to be imported.
-       "$(LLVM_BIN_DIR)"/llvm-objdump -p $(TMPDIR)/driver.exe | $(CGREP) -e "library_function"
+       $(OBJDUMP) -p $(TMPDIR)/driver.exe | $(CGREP) -e "library_function"
        $(call COMPILE_OBJ,"$(TMPDIR)"/extern_1.obj,extern_1.c)
        $(call COMPILE_OBJ,"$(TMPDIR)"/extern_2.obj,extern_2.c)
 ifdef IS_MSVC