about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbjorn3 <17426603+bjorn3@users.noreply.github.com>2023-03-04 11:06:33 +0000
committerbjorn3 <17426603+bjorn3@users.noreply.github.com>2023-04-19 18:55:15 +0000
commitd6fc3667dd3a3cd71897eba33c952077c24a65bd (patch)
tree715b9fce4f76f348a8212a711b479a1b7f909095
parent83f96e81423b63af89d04899e4710ca883c716f2 (diff)
downloadrust-d6fc3667dd3a3cd71897eba33c952077c24a65bd.tar.gz
rust-d6fc3667dd3a3cd71897eba33c952077c24a65bd.zip
Ignore test on MSVC for now
I can't figure out how to link with the MSVC toolchain
-rw-r--r--tests/run-make/staticlib-dylib-linkage/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/run-make/staticlib-dylib-linkage/Makefile b/tests/run-make/staticlib-dylib-linkage/Makefile
index fd76f6c5578..c3570a46327 100644
--- a/tests/run-make/staticlib-dylib-linkage/Makefile
+++ b/tests/run-make/staticlib-dylib-linkage/Makefile
@@ -1,5 +1,7 @@
 include ../tools.mk
 
+# ignore-msvc FIXME(bjorn3) can't figure out how to link with the MSVC toolchain
+
 all:
 	$(RUSTC) -C prefer-dynamic bar.rs
 	$(RUSTC) foo.rs --crate-type staticlib --print native-static-libs \
@@ -8,7 +10,8 @@ all:
 	cat $(TMPDIR)/libs.txt
 
 ifdef IS_MSVC
-	$(CC) $(CFLAGS) foo.c $(TMPDIR)/foo.lib $$(cat $(TMPDIR)/libs.txt) $(call OUT_EXE,foo)
+	$(CC) $(CFLAGS) /c foo.c /Fo:$(TMPDIR)/foo.o
+	$(RUSTC_LINKER) $(TMPDIR)/foo.o $(TMPDIR)/foo.lib $$(cat $(TMPDIR)/libs.txt) $(call OUT_EXE,foo)
 else
 	$(CC) $(CFLAGS) foo.c -L $(TMPDIR) -lfoo $$(cat $(TMPDIR)/libs.txt) -o $(call RUN_BINFILE,foo)
 endif