From 0d9fd8e2a1f8aa43b4cf66272eaa3cf695bbdcd9 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 3 Apr 2014 13:12:19 -0700 Subject: [PATCH] rmake: Fix a test on FreeBSD --- src/test/run-make/dep-info/Makefile | 8 +++++++- src/test/run-make/lto-smoke-c/Makefile | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/test/run-make/dep-info/Makefile b/src/test/run-make/dep-info/Makefile index 00a59383176d..277e7ad62944 100644 --- a/src/test/run-make/dep-info/Makefile +++ b/src/test/run-make/dep-info/Makefile @@ -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 diff --git a/src/test/run-make/lto-smoke-c/Makefile b/src/test/run-make/lto-smoke-c/Makefile index 8658950f1744..de8588bac9b7 100644 --- a/src/test/run-make/lto-smoke-c/Makefile +++ b/src/test/run-make/lto-smoke-c/Makefile @@ -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=)