Skip to content

Commit ca4138e

Browse files
brsonalexcrichton
authored andcommitted
---
yaml --- r: 150654 b: refs/heads/try2 c: e9108cd h: refs/heads/master v: v3
1 parent d50d1fa commit ca4138e

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 0e85e599dbcd08e2a0c0e1bfa3cf23ed4eb68197
8+
refs/heads/try2: e9108cd7b80ad3ff3f2c1f93ad2807876596d758
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/run-make/c-link-to-rust-staticlib/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@ ifneq ($(shell uname),Darwin)
44
EXTRAFLAGS := -lm -lrt -ldl -lpthread
55
endif
66

7+
# FIXME
8+
ifneq ($(shell uname),FreeBSD)
79
all:
810
$(RUSTC) foo.rs
911
ln -s $(call STATICLIB,foo-*) $(call STATICLIB,foo)
1012
$(CC) bar.c -lfoo -o $(call RUN,bar) $(EXTRAFLAGS) -lstdc++
1113
$(call RUN,bar)
1214
rm $(call STATICLIB,foo*)
1315
$(call RUN,bar)
16+
17+
else
18+
all:
19+
20+
endif

branches/try2/src/test/run-make/dep-info-custom/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
-include ../tools.mk
22

3+
# FIXME
4+
ifneq ($(shell uname),FreeBSD)
35
all:
46
$(RUSTC) --dep-info $(TMPDIR)/custom-deps-file.d --crate-type=lib lib.rs
57
sleep 1
@@ -10,3 +12,7 @@ all:
1012
pwd
1113
$(MAKE) -drf Makefile.foo
1214
rm $(TMPDIR)/done && exit 1 || exit 0
15+
else
16+
all:
17+
18+
endif

0 commit comments

Comments
 (0)