Mercurial > hg > release > icedtea7-forest-2.0 > jdk

changeset 4549:f093b908503d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use dpkg-architecture to override architecture from uname if available.
author andrew
date Thu, 22 Sep 2011 00:00:43 +0100
parents 0cb15650412a
children 3507a704279d
files make/common/shared/Platform.gmk
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Platform.gmk	Wed Sep 21 16:50:51 2011 +0100
+++ b/make/common/shared/Platform.gmk	Thu Sep 22 00:00:43 2011 +0100
@@ -160,6 +160,9 @@
   else
     mach := $(shell uname -m)
   endif
+  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 \