From a32a31aeb3af91e9ebee5fedeb9ae8e3e5e5170b Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Wed, 22 Mar 2017 00:13:11 +0100 Subject: [PATCH] Try to fix ignoring atomic-lock-free tests on armhf --- debian/changelog | 7 +++++++ debian/patches/u-ignoretest-armhf_01.patch | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2630a10a25..be05d8c7e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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. diff --git a/debian/patches/u-ignoretest-armhf_01.patch b/debian/patches/u-ignoretest-armhf_01.patch index 55b30684ae..9f6917bb97 100644 --- a/debian/patches/u-ignoretest-armhf_01.patch +++ b/debian/patches/u-ignoretest-armhf_01.patch @@ -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