nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-26 23:45:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #22360 - wg:master, r=alexcrichton

Browse Source
This commit is contained in:
Manish Goregaokar 2015-02-16 11:27:42 +05:30
commit cdf0cb0a16
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs
View File

@ -13,6 +13,7 @@
// gdb-pretty-struct-and-enums.rs // gdb-pretty-struct-and-enums.rs
// ignore-windows failing on win32 bot // ignore-windows failing on win32 bot
// ignore-freebsd: gdb package too new
// ignore-tidy-linelength // ignore-tidy-linelength
// ignore-lldb // ignore-lldb
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)

1
src/test/debuginfo/gdb-pretty-struct-and-enums.rs
View File

@ -9,6 +9,7 @@
// except according to those terms. // except according to those terms.
// ignore-windows failing on win32 bot // ignore-windows failing on win32 bot
// ignore-freebsd: output doesn't match
// ignore-tidy-linelength // ignore-tidy-linelength
// ignore-lldb // ignore-lldb
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)

4
src/test/run-make/use-extern-for-plugins/Makefile
View File

@ -1,6 +1,6 @@
-include ../tools.mk -include ../tools.mk
ifneq ($(UNAME),OpenBSD) ifneq ($(findstring BSD,$(UNAME)),BSD)
HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //')
ifeq ($(findstring i686,$(HOST)),i686) ifeq ($(findstring i686,$(HOST)),i686)
TARGET := $(subst i686,x86_64,$(HOST)) TARGET := $(subst i686,x86_64,$(HOST))
@ -13,6 +13,6 @@ all:
$(RUSTC) bar.rs -C extra-filename=-targ --target $(TARGET) $(RUSTC) bar.rs -C extra-filename=-targ --target $(TARGET)
$(RUSTC) baz.rs --extern a=$(TMPDIR)/liba-targ.rlib --target $(TARGET) $(RUSTC) baz.rs --extern a=$(TMPDIR)/liba-targ.rlib --target $(TARGET)
else else
# OpenBSD support only x86_64 architecture for now # FreeBSD & OpenBSD support only x86_64 architecture for now
all: all:
endif endif