Fix arch:all build, for real

This commit is contained in:
Gianfranco Costamagna 2018-09-14 15:13:17 +02:00
parent ff2dadf52e
commit 376fd17f46
3 changed files with 29 additions and 0 deletions

26
debian/patches/powerpcspe.patch vendored Normal file
View File

@ -0,0 +1,26 @@
From 2b0d645c8f211c89aa53a1a442fffa8370915491 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Thu, 13 Sep 2018 23:59:21 +0200
Subject: [PATCH] [Driver] Fix missing MultiArch include dir on powerpcspe
---
lib/Driver/ToolChains/Linux.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
index 2a87cb077c..a7f4e9332b 100644
--- a/lib/Driver/ToolChains/Linux.cpp
+++ b/lib/Driver/ToolChains/Linux.cpp
@@ -699,7 +699,8 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
"/usr/include/mips64el-linux-gnu",
"/usr/include/mips64el-linux-gnuabi64"};
const StringRef PPCMultiarchIncludeDirs[] = {
- "/usr/include/powerpc-linux-gnu"};
+ "/usr/include/powerpc-linux-gnu",
+ "/usr/include/powerpc-linux-gnuspe"};
const StringRef PPC64MultiarchIncludeDirs[] = {
"/usr/include/powerpc64-linux-gnu"};
const StringRef PPC64LEMultiarchIncludeDirs[] = {
--
2.19.0

View File

@ -73,3 +73,4 @@ D51108-rust-powerpc.diff
disable-sse2-old-x86.diff
powerpcspe.patch

2
debian/rules vendored
View File

@ -638,6 +638,8 @@ ifeq (${POLLY_ENABLE},yes)
# only for arch:any builds
ifneq (,$(filter libclang-common-$(LLVM_VERSION)-dev, $(shell dh_listpackages)))
dh_install -p libclang-common-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly
else
rm -rf $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake
endif
endif
dh_install --fail-missing