# HG changeset patch
# User andrew
# Date 1316646057 -3600
# Node ID fb1a37aeb2a13bb66d472495d0ad4463f57d9b87
# Parent  616c760dc288daa577ae962d2deb7afebaed7fcf
Use dpkg-architecture to override architecture from uname if available.

diff -r 616c760dc288 -r fb1a37aeb2a1 make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk	Mon Jul 11 22:05:36 2011 +0100
+++ b/make/common/shared/Platform.gmk	Thu Sep 22 00:00:57 2011 +0100
@@ -153,6 +153,9 @@
   OS_VERSION := $(shell uname -r)
   # Arch and OS name/version
   mach := $(shell uname -m)
+  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
+    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/;s/hppa/parisc/')
+  endif
   archExpr = case "$(mach)" in \
                 i[3-9]86) \
                     echo i586 \