From 3cc683e8092744dd1ff60d95120a5c049586193a Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Fri, 7 Dec 2007 10:11:47 +0000 Subject: [PATCH] * (bug 3460) Revert OS X uname change --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 04009a25..91c40477 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,15 @@ COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]') +COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/x86/) + ifeq ($(COMPILE_PLATFORM),sunos) # Solaris uname and GNU uname differ - COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/) -else - COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/) + COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/x86/) +endif +ifeq ($(COMPILE_PLATFORM),darwin) + # Apple does some things a little differently... + COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/x86/) endif ifeq ($(COMPILE_PLATFORM),mingw32)