Fix test fallout
Signed-off-by: Peter Atashian <retep998@gmail.com>
This commit is contained in:
parent
06c66d6ca2
commit
1b0064ea60
|
@ -7,7 +7,7 @@ all: $(TMPDIR)/$(call BIN,bar)
|
|||
|
||||
ifdef IS_MSVC
|
||||
$(TMPDIR)/$(call BIN,bar): $(call DYLIB,foo)
|
||||
$(CC) bar.c $(TMPDIR)/foo.lib $(call OUT_EXE,bar)
|
||||
$(CC) bar.c $(TMPDIR)/foo.dll.lib $(call OUT_EXE,bar)
|
||||
else
|
||||
$(TMPDIR)/$(call BIN,bar): $(call DYLIB,foo)
|
||||
$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) -L $(TMPDIR)
|
||||
|
|
|
@ -4,11 +4,10 @@
|
|||
ifneq ($(shell uname),FreeBSD)
|
||||
all:
|
||||
$(RUSTC) foo.rs
|
||||
cp $(TMPDIR)/libfoo.a $(call NATIVE_STATICLIB,foo2)
|
||||
$(CC) bar.c $(call NATIVE_STATICLIB,foo2) $(call OUT_EXE,bar) \
|
||||
$(CC) bar.c $(call STATICLIB,foo) $(call OUT_EXE,bar) \
|
||||
$(EXTRACFLAGS) $(EXTRACXXFLAGS)
|
||||
$(call RUN,bar)
|
||||
rm $(call STATICLIB,foo*)
|
||||
rm $(call STATICLIB,foo)
|
||||
$(call RUN,bar)
|
||||
|
||||
else
|
||||
|
|
|
@ -5,7 +5,7 @@ CC := $(CC:-g=)
|
|||
|
||||
all:
|
||||
$(RUSTC) foo.rs -C lto
|
||||
$(CC) bar.c $(TMPDIR)/libfoo.a \
|
||||
$(CC) bar.c $(call STATICLIB,foo) \
|
||||
$(call OUT_EXE,bar) \
|
||||
$(EXTRACFLAGS) $(EXTRACXXFLAGS)
|
||||
$(call RUN,bar)
|
||||
|
|
|
@ -4,8 +4,8 @@ all:
|
|||
$(RUSTC) foo.rs --crate-type=rlib,dylib,staticlib
|
||||
$(call REMOVE_RLIBS,bar)
|
||||
$(call REMOVE_DYLIBS,bar)
|
||||
rm $(TMPDIR)/libbar.a
|
||||
rm -f $(TMPDIR)/bar.{exp,lib,pdb}
|
||||
rm $(call STATICLIB,bar)
|
||||
rm -f $(TMPDIR)/bar.{dll.exp,dll.lib,pdb}
|
||||
# Check that $(TMPDIR) is empty.
|
||||
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
|
||||
|
||||
|
@ -78,7 +78,7 @@ all:
|
|||
rm $(TMPDIR)/$(call BIN,foo)
|
||||
$(RUSTC) foo.rs --crate-type=dylib --emit=link=$(TMPDIR)/$(call BIN,foo)
|
||||
rm $(TMPDIR)/$(call BIN,foo)
|
||||
rm -f $(TMPDIR)/foo.{exp,lib,pdb}
|
||||
rm -f $(TMPDIR)/foo.{dll.exp,dll.lib,pdb}
|
||||
[ "$$(ls -1 $(TMPDIR) | wc -l)" -eq "0" ]
|
||||
|
||||
$(RUSTC) foo.rs --crate-type=staticlib -o $(TMPDIR)/foo
|
||||
|
@ -133,7 +133,7 @@ all:
|
|||
rm $(TMPDIR)/bar.ll
|
||||
rm $(TMPDIR)/bar.s
|
||||
rm $(TMPDIR)/bar.o
|
||||
rm $(TMPDIR)/libbar.a
|
||||
rm $(call STATICLIB,bar)
|
||||
mv $(TMPDIR)/bar.bc $(TMPDIR)/foo.bc
|
||||
# Don't check that the $(TMPDIR) is empty - we left `foo.bc` for later
|
||||
# comparison.
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
TO_LINK := $(call DYLIB,bar)
|
||||
ifdef IS_MSVC
|
||||
LINK_ARG = $(TO_LINK:dll=lib)
|
||||
LINK_ARG = $(TO_LINK:dll=dll.lib)
|
||||
else
|
||||
LINK_ARG = $(TO_LINK)
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue