- Fix snapshot builds for ppc64el

git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.8@7072 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

3 files changed, 4 insertions, 1 deletions

diff --git a/debian/rules.defs b/debian/rules.defs
index 5862ea1..26673c1 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -491,7 +491,7 @@ ada_no_cpus	:= m32r sh3 sh3eb sh4 sh4eb
 ada_no_systems	:= 
 ada_no_cross	:= yes
 ada_no_snap	:= no
-ifneq (,$(filter $(DEB_TARGET_ARCH),arm64 armhf m68k powerpcspe sh4 sparc64))
+ifneq (,$(filter $(DEB_TARGET_ARCH),arm64 armhf m68k powerpcspe ppc64el sh4 sparc64))
   ada_no_snap := yes
 endif
 
diff --git a/debian/rules.patch b/debian/rules.patch
index 1194a4f..33ab557 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -342,9 +342,11 @@ ifeq ($(biarch64),yes)
   endif
 endif
 debian_patches += gcc-multilib-multiarch
+ifneq ($(trunk_build),yes)
 ifeq ($(with_ibm_branch),yes)
   debian_patches += powerpc64le-multilib-definitions
 endif
+endif
 
 ifneq (,$(filter $(derivative),Ubuntu))
   ifeq (,$(filter $(distrelease),dapper hardy intrepid jaunty karmic lucid maverick))
diff --git a/debian/rules2 b/debian/rules2
index 37f9417..6c49a6f 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -356,6 +356,7 @@ endif
 ifneq (,$(findstring powerpc64le-linux,$(DEB_TARGET_GNU_TYPE)))
     CONFARGS += --enable-secureplt
     CONFARGS += --with-cpu=power7 --with-tune=power8
+    CONFARGS += --disable-multilib
 endif
 
 ifneq (,$(findstring powerpc64-linux,$(DEB_TARGET_GNU_TYPE)))