Skip to content

Commit ba94003

Browse files
committed
---
yaml --- r: 110220 b: refs/heads/auto c: 0d9fd8e h: refs/heads/master v: v3
1 parent 0d707f5 commit ba94003

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 8ded99c0efa41a960560f8bc0f82c11ea96655d6
16+
refs/heads/auto: 0d9fd8e2a1f8aa43b4cf66272eaa3cf695bbdcd9
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
-include ../tools.mk
22

3+
ifneq ($(shell uname),FreeBSD)
34
all:
45
$(RUSTC) --dep-info --crate-type=lib lib.rs
5-
sleep 1
6+
sleep 2
67
touch foo.rs
78
-rm -f $(TMPDIR)/done
89
$(MAKE) -drf Makefile.foo
10+
sleep 2
911
rm $(TMPDIR)/done
1012
pwd
1113
$(MAKE) -drf Makefile.foo
1214
rm $(TMPDIR)/done && exit 1 || exit 0
15+
else
16+
all:
17+
18+
endif

branches/auto/src/test/run-make/lto-smoke-c/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
-include ../tools.mk
22

3-
ifneq ($(shell uname),Darwin)
3+
ifeq ($(shell uname),Darwin)
4+
else
5+
ifeq ($(shell uname),FreeBSD)
6+
EXTRAFLAGS := -lm -lpthread -lgcc_s
7+
else
48
EXTRAFLAGS := -lm -lrt -ldl -lpthread
59
endif
10+
endif
611

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

0 commit comments

Comments
 (0)