diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-03-09 19:41:44 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-05-11 14:35:10 +0000 |
| commit | 8ace03e152957b8ce8ccbc8d0f9cbd19db4937a8 (patch) | |
| tree | 72ea1edd58aa4382b2eb60bbbf1fba460f06d450 | |
| parent | 34f6a83b28cd88a9f4e6cf790d3f270a489f1bf2 (diff) | |
| download | rust-8ace03e152957b8ce8ccbc8d0f9cbd19db4937a8.tar.gz rust-8ace03e152957b8ce8ccbc8d0f9cbd19db4937a8.zip | |
Fix no-alloc-shim test on MSVC
| -rw-r--r-- | tests/run-make-fulldeps/no-alloc-shim/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/run-make-fulldeps/no-alloc-shim/Makefile b/tests/run-make-fulldeps/no-alloc-shim/Makefile index 03679fb604e..f3dbbf1fd63 100644 --- a/tests/run-make-fulldeps/no-alloc-shim/Makefile +++ b/tests/run-make-fulldeps/no-alloc-shim/Makefile @@ -5,7 +5,7 @@ TARGET_LIBDIR = $$($(RUSTC) --print target-libdir) all: $(RUSTC) foo.rs --crate-type bin --emit obj -Cpanic=abort ifdef IS_MSVC - $(CC) $(CFLAGS) $(TMPDIR)/foo.o $(TARGET_LIBDIR)/liballoc-*.rlib $(TARGET_LIBDIR)/libcore-*.rlib $(TARGET_LIBDIR)/libcompiler_builtins-*.rlib $(call OUT_EXE,foo) + $(CC) $(CFLAGS) $(TMPDIR)/foo.o $(call OUT_EXE,foo) /link $(TARGET_LIBDIR)/liballoc-*.rlib $(TARGET_LIBDIR)/libcore-*.rlib $(TARGET_LIBDIR)/libcompiler_builtins-*.rlib $(call OUT_EXE,foo) else $(CC) $(CFLAGS) $(TMPDIR)/foo.o $(TARGET_LIBDIR)/liballoc-*.rlib $(TARGET_LIBDIR)/libcore-*.rlib $(TARGET_LIBDIR)/libcompiler_builtins-*.rlib -o $(call RUN_BINFILE,foo) @@ -15,7 +15,7 @@ endif # Check that linking without __rust_no_alloc_shim_is_unstable defined fails $(RUSTC) foo.rs --crate-type bin --emit obj -Cpanic=abort --cfg check_feature_gate ifdef IS_MSVC - $(CC) $(CFLAGS) $(TMPDIR)/foo.o $(TARGET_LIBDIR)/liballoc-*.rlib $(TARGET_LIBDIR)/libcore-*.rlib $(TARGET_LIBDIR)/libcompiler_builtins-*.rlib $(call OUT_EXE,foo) || exit 0 && exit 1 + $(CC) $(CFLAGS) $(TMPDIR)/foo.o $(call OUT_EXE,foo) /link $(TARGET_LIBDIR)/liballoc-*.rlib $(TARGET_LIBDIR)/libcore-*.rlib $(TARGET_LIBDIR)/libcompiler_builtins-*.rlib || exit 0 && exit 1 else $(CC) $(CFLAGS) $(TMPDIR)/foo.o $(TARGET_LIBDIR)/liballoc-*.rlib $(TARGET_LIBDIR)/libcore-*.rlib $(TARGET_LIBDIR)/libcompiler_builtins-*.rlib -o $(call RUN_BINFILE,foo) || exit 0 && exit 1 endif |