diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-04-03 13:12:19 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-04-06 15:55:43 -0700 |
| commit | 0d9fd8e2a1f8aa43b4cf66272eaa3cf695bbdcd9 (patch) | |
| tree | ccff779312fea1a7563000d2b952447eb4756586 /src | |
| parent | 8ded99c0efa41a960560f8bc0f82c11ea96655d6 (diff) | |
| download | rust-0d9fd8e2a1f8aa43b4cf66272eaa3cf695bbdcd9.tar.gz rust-0d9fd8e2a1f8aa43b4cf66272eaa3cf695bbdcd9.zip | |
rmake: Fix a test on FreeBSD
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/run-make/dep-info/Makefile | 8 | ||||
| -rw-r--r-- | 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 00a59383176..277e7ad6294 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 8658950f174..de8588bac9b 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=) |