Merge branch 'debian/sid' into debian/experimental

This commit is contained in:
Ximin Luo 2017-04-05 16:48:53 +02:00
commit eb81f7e1f3
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -5,6 +5,13 @@ rustc (1.16.0+dfsg1-1~exp1) experimental; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 17 Mar 2017 10:33:46 +0100
rustc (1.15.1+dfsg1-1) unstable; urgency=medium
* Upload to unstable so we have something to build 1.16 with.
* Try to fix ignoring atomic-lock-free tests on armhf.
-- Ximin Luo <infinity0@debian.org> Wed, 22 Mar 2017 00:13:27 +0100
rustc (1.15.1+dfsg1-1~exp3) experimental; urgency=medium
* Ignore atomic-lock-free tests on armhf.

View File

@ -9,7 +9,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
all:
ifeq ($(UNAME),Linux)
+ifeq (,$(filter armv7-unknown-linux-gnueabihf,$(CFG_TARGET)))
+ifeq (,$(filter armv7-unknown-linux-gnueabihf,$(TARGET)))
ifeq ($(filter x86,$(LLVM_COMPONENTS)),x86)
$(RUSTC) --target=i686-unknown-linux-gnu atomic_lock_free.rs
nm "$(TMPDIR)/libatomic_lock_free.rlib" | grep -vq __atomic_fetch_add