summaryrefslogtreecommitdiff
path: root/solenv/inc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 16:15:13 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 16:15:13 +0000
commit550f0a65ba6d69714b91d8df1ace11eb4f56b802 (patch)
tree38115bcb5bac1ac73984664a1227b47109965b8a /solenv/inc
parent41c48b8509969940d6f6b09214b882e126f6b331 (diff)
INTEGRATION: CWS warnings01 (1.7.56); FILE MERGED
2006/01/25 19:04:45 sb 1.7.56.4: RESYNC: (1.8-1.9); FILE MERGED 2005/11/09 10:34:30 sb 1.7.56.3: #i53898# CFLAGSWARN...: cleaned up and incorporated changes already made for unxlngi6.mk. 2005/09/22 23:27:14 sb 1.7.56.2: RESYNC: (1.7-1.8); FILE MERGED 2005/08/29 11:48:51 sb 1.7.56.1: #i53898# Changed and extended CFLAGSDFTLWARN/CFLAGSWALL to CFLAGS{WARN|WALL|WERR}{CC|CXX}.
Diffstat (limited to 'solenv/inc')
-rw-r--r--solenv/inc/unxlngp.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/solenv/inc/unxlngp.mk b/solenv/inc/unxlngp.mk
index 09001189d0b7..09cefd7ffa61 100644
--- a/solenv/inc/unxlngp.mk
+++ b/solenv/inc/unxlngp.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: unxlngp.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.10 $
#
-# last change: $Author: obo $ $Date: 2006-01-20 10:50:16 $
+# last change: $Author: hr $ $Date: 2006-06-19 17:15:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -62,7 +62,6 @@ CC*=gcc
CFLAGS=-nostdinc -c $(INCLUDE)
CFLAGSCC= -pipe $(ARCH_FLAGS)
CFLAGSCXX= -pipe -fguiding-decls -fno-rtti -fno-exceptions $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
# Exceptions increase the size of shared libraries by 50% !!
.IF "$(PRJNAME)"=="usr" || "$(PRJNAME)"=="uno" || "$(PRJNAME)"=="starone" || "$(PRJNAME)"=="schedule" || "$(PRJNAME)"=="one" || "$(SET_EXEPTIONS)"!=""
@@ -83,6 +82,13 @@ CFLAGSOPT=-O2
CFLAGSNOOPT=
CFLAGSOUTOBJ=-o
+CFLAGSWARNCC=
+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
+CFLAGSWERRCC=-Werror
+
STATIC = -Bstatic
DYNAMIC = -Bdynamic