diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:12:12 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-27 11:12:12 +0000 |
| commit | eff5657503f9a65fc1f2aac2969f6073f5e0b283 (patch) | |
| tree | 89e018c6b925b665f5eae1078cd2142235f220be /python | |
| parent | 8f289ead7b33440397958ede54f72a56148d99fb (diff) | |
INTEGRATION: CWS hr44 (1.33.2); FILE MERGED
2007/06/21 14:57:59 hr 1.33.2.1: #i78750#: configure SunStudio on Solaris with -xc99=all flag
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index ca812ad1cce4..a0382362adef 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.33 $ +# $Revision: 1.34 $ # -# last change: $Author: ihi $ $Date: 2007-06-05 10:45:54 $ +# last change: $Author: hr $ $Date: 2007-06-27 12:12:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -105,16 +105,20 @@ python_CFLAGS+=$(C_RESTRICTIONFLAGS) python_LDFLAGS+=-Wl,-z,noexecstack .ENDIF +# 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 "$(COMNAME)"=="sunpro5" +CC+=-xc99=all +.ENDIF # "$(COMNAME)"=="sunpro5" +.ENDIF + + CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)" .IF "$(OS)$(CPU)" == "SOLARISI" CONFIGURE_ACTION += --disable-ipv6 .ENDIF -.IF "$(COMNAME)"=="sunpro5" -#.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" -#CC:=$(COMPATH)$/bin$/cc -#.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" -.ENDIF # "$(COMNAME)"=="sunpro5" - .IF "$(OS)" == "IRIX" BUILD_ACTION=$(ENV_BUILD) gmake -j$(EXTMAXPROCESS) ; gmake install .ELSE |