Control: tags -1 + patch

fixes the build failures on powerpc and i386 (failing avx tests, see the Ubuntu
build logs for details).
https://launchpad.net/ubuntu/+source/llvm-toolchain-3.8/1:3.8.1-7ubuntu1
  * Ignore test results on i386, as done on any other architecture.
  * Don't use gold on powerpc, not supporting secure-plt.
 
diff -Nru llvm-toolchain-3.8-3.8.1/debian/rules llvm-toolchain-3.8-3.8.1/debian/rules
--- llvm-toolchain-3.8-3.8.1/debian/rules	2016-08-05 09:55:12.000000000 +0200
+++ llvm-toolchain-3.8-3.8.1/debian/rules	2016-08-07 13:03:30.000000000 +0200
@@ -67,9 +67,9 @@
 	control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev'
 endif
 
-BINUTILS_GOLD_ARCHS := amd64 armhf i386 powerpc powerpcspe ppc64 ppc64el sparc sparc64 x32
+BINUTILS_GOLD_ARCHS := amd64 armhf i386 powerpcspe ppc64 ppc64el sparc sparc64 x32
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0)
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
+ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
 # -fused-ld=gold enables the gold linker (but is not supported by all archs / distro)
 	LDFLAGS_EXTRA += -fuse-ld=gold
 	CXXFLAGS_EXTRA += -Wl,-fuse-ld=gold
@@ -478,7 +478,7 @@
 
 ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
 # List of the archs we know we have 100 % tests working
-ARCH_LLVM_TEST_OK := i386
+ARCH_LLVM_TEST_OK :=
 
 override_dh_auto_test:
 

Reply via email to