diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 11:38:03 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 11:38:03 +0000 |
commit | 7a1b190d461479a6a12e27b14a280575ae5c1be9 (patch) | |
tree | ca7a6432fdb822e7d8a0bdfebaff37de636bbbe5 | |
parent | cbf3e494b48754b8cad3fcf6b4e6f0cbac5bb623 (diff) |
INTEGRATION: CWS ooo20031216 (1.21.2); FILE MERGED
2004/01/26 14:20:45 mh 1.21.2.2: RESYNC: (1.21-1.22); FILE MERGED
2003/12/14 10:03:24 waratah 1.21.2.1: #i21906# remove permissive options, code now clean
-rw-r--r-- | solenv/inc/unxlngi4.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/unxlngi4.mk b/solenv/inc/unxlngi4.mk index ae27f46bdae7..07183d03cd3d 100644 --- a/solenv/inc/unxlngi4.mk +++ b/solenv/inc/unxlngi4.mk @@ -2,9 +2,9 @@ # # $RCSfile: unxlngi4.mk,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # -# last change: $Author: vg $ $Date: 2003-12-17 18:08:58 $ +# last change: $Author: hr $ $Date: 2004-02-04 12:38:03 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -106,7 +106,7 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs CFLAGS_NO_EXCEPTIONS=-fno-exceptions # -fpermissive should be removed as soon as possible -CFLAGSCXX= -pipe -mcpu=pentiumpro -fpermissive -fno-rtti +CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-rtti # HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers .IF "$(BUILD_SPECIAL)"=="" |