Skip to content

Commit

Permalink
rmake: Fix a test on FreeBSD
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton committed Apr 6, 2014
1 parent 8ded99c commit 0d9fd8e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/test/run-make/dep-info/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
-include ../tools.mk

ifneq ($(shell uname),FreeBSD)
all:
$(RUSTC) --dep-info --crate-type=lib lib.rs
sleep 1
sleep 2
touch foo.rs
-rm -f $(TMPDIR)/done
$(MAKE) -drf Makefile.foo
sleep 2
rm $(TMPDIR)/done
pwd
$(MAKE) -drf Makefile.foo
rm $(TMPDIR)/done && exit 1 || exit 0
else
all:

endif
7 changes: 6 additions & 1 deletion src/test/run-make/lto-smoke-c/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
-include ../tools.mk

ifneq ($(shell uname),Darwin)
ifeq ($(shell uname),Darwin)
else
ifeq ($(shell uname),FreeBSD)
EXTRAFLAGS := -lm -lpthread -lgcc_s
else
EXTRAFLAGS := -lm -lrt -ldl -lpthread
endif
endif

# Apparently older versions of GCC segfault if -g is passed...
CC := $(CC:-g=)
Expand Down

0 comments on commit 0d9fd8e

Please sign in to comment.