diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 15:40:35 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 15:40:35 +0000 |
| commit | 94bc2815597c83116c53e71422d63195e733f532 (patch) | |
| tree | ce226df0b123f4a07bc9beeb28297209f1f772ba /config_office | |
| parent | 5a2d55ad4dce79ad626aef1f97e65400b7a84f7d (diff) | |
INTEGRATION: CWS pchfix04 (1.124.2); FILE MERGED
2007/04/26 03:54:53 hjs 1.124.2.9: RESYNC: (1.136-1.140); FILE MERGED
2007/02/13 16:23:06 hjs 1.124.2.8: RESYNC: (1.135-1.136); FILE MERGED
2007/01/26 20:26:11 hjs 1.124.2.7: RESYNC: (1.128-1.135); FILE MERGED
2006/12/22 12:52:34 hjs 1.124.2.6: RESYNC: (1.127-1.128); FILE MERGED
2006/12/13 15:11:37 kaib 1.124.2.5: #i71519# Reverting my second addition of --enable-pch to configure.in
2006/12/13 14:38:20 kaib 1.124.2.4: #i71519# added --enable-pch option to configure
2006/12/11 14:49:42 kaib 1.124.2.3: RESYNC: (1.125-1.127); FILE MERGED
2006/12/04 19:22:04 kaib 1.124.2.2: RESYNC: (1.124-1.125); FILE MERGED
2006/11/24 11:59:22 mkretzschmar 1.124.2.1: #i71927# Set CVER to C341 for gcc >= 3.4.1 on Mac OS X
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/set_soenv.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index 3f372a4885d1..aa4a16d21f9d 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -1,8 +1,8 @@ #!@PERL@ -w # # Program: set_soenv.in -# Version: $Revision: 1.143 $ -# Date: $Date: 2007-05-10 13:15:24 $ +# Version: $Revision: 1.144 $ +# Date: $Date: 2007-05-10 16:40:35 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -667,7 +667,11 @@ elsif ( $platform =~ m/darwin/ ) $CPUNAME = "POWERPC"; $OUTPATH = "unxmacxp"; } - $CVER = "C300"; + if (@GCCVER@ >= 30401) { + $CVER = "C341"; + } else { + $CVER = "C300"; + } $GUI = "UNX"; $GUIENV = "sal"; $GVER = "VCL"; |