Try to fix ignoring atomic-lock-free tests on armhf

This commit is contained in:
Ximin Luo 2017-03-22 00:13:11 +01:00
parent e319008581
commit a32a31aeb3
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
rustc (1.15.1+dfsg1-1) UNRELEASED; 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:11:39 +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