diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:27:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:27:36 +0000 |
| commit | 37617f180e6e1579e965cb98f7d233d40cd41994 (patch) | |
| tree | 76dca17c67902b32430c65055a51680d03e014fe /python | |
| parent | 64b92e4275272274487e17ab95d5104055948b98 (diff) | |
INTEGRATION: CWS hr51 (1.38.6); FILE MERGED
2008/06/06 14:49:25 hr 1.38.6.1: #i88947#: Solaris 64 bit support
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
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" |