Skip to content

Commit d6b94bf

Browse files
committed
---
yaml --- r: 110501 b: refs/heads/snap-stage3 c: 0d9fd8e h: refs/heads/master i: 110499: 1430921 v: v3
1 parent cd38ea6 commit d6b94bf

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
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: e415c25bcd81dc1f9a5a3d25d9b48ed2d545336b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 8ded99c0efa41a960560f8bc0f82c11ea96655d6
4+
refs/heads/snap-stage3: 0d9fd8e2a1f8aa43b4cf66272eaa3cf695bbdcd9
55
refs/heads/try: 597a645456b55e1c886ce15d23a192abdf4d55cf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
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/snap-stage3/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)