diff -ru debian/rules.defs debian/rules.defs
--- debian/rules.defs	2011-09-04 17:28:27.256578895 -0400
+++ debian/rules.defs	2011-09-04 17:28:11.796578893 -0400
@@ -65,7 +65,11 @@
   DEB_GCC_TARGET := $(GCC_TARGET)
 endif
 ifdef DEB_TARGET_GNU_TYPE
-  TARGET_VARS := $(shell dpkg-architecture -f -t$(DEB_TARGET_GNU_TYPE) 2>/dev/null)
+  ifdef GCC_TARGET
+    TARGET_VARS := $(shell dpkg-architecture -f -a$(GCC_TARGET) -t$(DEB_TARGET_GNU_TYPE) 2>/dev/null)
+  else
+    TARGET_VARS := $(shell dpkg-architecture -f -t$(DEB_TARGET_GNU_TYPE) 2>/dev/null)
+  endif
 else
   # allow debian/target to be used instead of DEB_GCC_TARGET - this was requested
   # by toolchain-source maintainer