From 37617f180e6e1579e965cb98f7d233d40cd41994 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Mon, 16 Jun 2008 13:27:36 +0000
Subject: INTEGRATION: CWS hr51 (1.38.6); FILE MERGED 2008/06/06 14:49:25 hr
 1.38.6.1: #i88947#: Solaris 64 bit support

---
 python/makefile.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'python')

diff --git a/python/makefile.mk b/python/makefile.mk
index d819009ed34e..0bcdf9754546 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.38 $
+# $Revision: 1.39 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -105,12 +105,16 @@ python_LDFLAGS+=-Wl,-z,noexecstack
 # SunStudio on Solaris 10 and above needs the -xc99=all flag already 
 # during the configuration tests, otherwise the HAVE_LIMITS_H check will
 # be wrong resulting in a build breaker.
-.IF "$(SYSBASE)"==""
+.IF "$(SYSBASE)"=="" || "$(OS)$(CPU)"=="SOLARISU"
 .IF "$(COMNAME)"=="sunpro5"
-CC+=-xc99=all
+CC+:=-xc99=all
 .ENDIF          # "$(COMNAME)"=="sunpro5"
 .ENDIF
 
+.IF "$(OS)$(CPU)"=="SOLARISU"
+CC+:=$(ARCH_FLAGS)
+python_LDFLAGS+=$(ARCH_FLAGS)
+.ENDIF
 
 CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)"
 .IF "$(OS)$(CPU)" == "SOLARISI"
-- 
cgit v1.2.3