Bug#742539: src:gcc-4.8: DEB_TARGET_ARCH=x32 builds an amd64 compiler when multilib is disabled

[Helmut Grohne <helmut@subdivi.de>]

Package: src:gcc-4.8
Version: 4.8.2-17
Severity: normal
Tags: patch

When building a non-multilib stage1 cross compiler targeting x32, an
amd64 compiler is built instead. The attached patch takes care to add
the missing --with-abi flag for this situation.

Helmut

diff -u gcc-4.8-4.8.2/debian/rules2 gcc-4.8-4.8.2/debian/rules2
--- gcc-4.8-4.8.2/debian/rules2
+++ gcc-4.8-4.8.2/debian/rules2
@@ -505,11 +505,14 @@
 ifeq ($(DEB_TARGET_ARCH),amd64)
   CONFARGS += --with-abi=m64
 endif
+ifeq ($(DEB_TARGET_ARCH),x32)
+  CONFARGS += --with-abi=mx32
+endif
 ifeq ($(multilib),yes)
   ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 i386))
     CONFARGS += --with-multilib-list=m32,m64$(if $(filter yes,$(biarchx32)),$(COMMA)mx32)
   else ifeq ($(DEB_TARGET_ARCH),x32)
-    CONFARGS += --with-abi=mx32 --with-multilib-list=mx32,m64,m32
+    CONFARGS += --with-multilib-list=mx32,m64,m32
   endif
 endif