Mercurial > hg > release > icedtea7-forest-2.0 > corba
changeset 327:fb1a37aeb2a1
Use dpkg-architecture to override architecture from uname if available.
author | andrew |
---|---|
date | Thu, 22 Sep 2011 00:00:57 +0100 |
parents | 616c760dc288 |
children | d034cc90ecc2 |
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 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 \