summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 16:13:37 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 16:13:37 +0000
commit55bdd56cca3b53fd85e5e5055f48769bf37ca07b (patch)
treed4575585e01ef4f29f0e7434697e7cb93d939464
parentf1e3d78f97e55b8464ce9865df02c4a684610637 (diff)
INTEGRATION: CWS warnings01 (1.11.56); FILE MERGED
2005/11/09 10:34:28 sb 1.11.56.4: #i53898# CFLAGSWARN...: cleaned up and incorporated changes already made for unxlngi6.mk. 2005/11/07 17:19:01 pl 1.11.56.3: RESYNC: (1.12-1.13); FILE MERGED 2005/09/22 23:25:33 sb 1.11.56.2: RESYNC: (1.11-1.12); FILE MERGED 2005/08/29 11:48:50 sb 1.11.56.1: #i53898# Changed and extended CFLAGSDFTLWARN/CFLAGSWALL to CFLAGS{WARN|WALL|WERR}{CC|CXX}.
-rw-r--r--solenv/inc/unxbsds.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
index 0d905830f562..2ce25de965b8 100644
--- a/solenv/inc/unxbsds.mk
+++ b/solenv/inc/unxbsds.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: unxbsds.mk,v $
#
-# $Revision: 1.13 $
+# $Revision: 1.14 $
#
-# last change: $Author: kz $ $Date: 2005-10-05 11:32:40 $
+# last change: $Author: hr $ $Date: 2006-06-19 17:13:37 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -76,7 +76,6 @@ CFLAGSEXCEPTIONS=-fexceptions
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
CFLAGSCXX= -pipe $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
PICSWITCH:=-fPIC
# Compiler flags for compiling static object in single threaded environment with graphical user interface
@@ -103,6 +102,13 @@ CFLAGSNOOPT=-O
# Compiler flags for describing the output path
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
+
# switches for dynamic and static linking
STATIC = -Wl,-Bstatic
DYNAMIC = -Wl,-Bdynamic