summaryrefslogtreecommitdiff
path: root/solenv/inc/unxscoi.mk
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 16:16:48 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 16:16:48 +0000
commit21ddc33119240bc7aaae590e3afed430c9708a95 (patch)
tree60382f06517a9b74e5bbd24aed7425ecae322211 /solenv/inc/unxscoi.mk
parent8b150bf6f639fce4d8a4e8da231fcce05fb66b5c (diff)
INTEGRATION: CWS warnings01 (1.7.56); FILE MERGED
2005/11/09 10:34:32 sb 1.7.56.3: #i53898# CFLAGSWARN...: cleaned up and incorporated changes already made for unxlngi6.mk. 2005/09/22 23:28:41 sb 1.7.56.2: RESYNC: (1.7-1.8); FILE MERGED 2005/08/29 11:48:52 sb 1.7.56.1: #i53898# Changed and extended CFLAGSDFTLWARN/CFLAGSWALL to CFLAGS{WARN|WALL|WERR}{CC|CXX}.
Diffstat (limited to 'solenv/inc/unxscoi.mk')
-rw-r--r--solenv/inc/unxscoi.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk
index aee0fa953f50..f67e11cec564 100644
--- a/solenv/inc/unxscoi.mk
+++ b/solenv/inc/unxscoi.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: unxscoi.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
-# last change: $Author: rt $ $Date: 2005-09-08 09:59:55 $
+# last change: $Author: hr $ $Date: 2006-06-19 17:16:48 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -53,7 +53,6 @@ CFLAGSCC=$(ARCH_FLAGS)
CFLAGSEXCEPTIONS=-fexceptions
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
CFLAGSCXX=-fguiding-decls -frtti $(ARCH_FLAGS)
-CFLAGSCXX+= -Wno-ctor-dtor-privacy
PICSWITCH:=-fPIC
CFLAGSOBJGUIST=$(PICSWITCH)
CFLAGSOBJCUIST=$(PICSWITCH)
@@ -68,6 +67,13 @@ CFLAGSOPT=-O2
CFLAGSNOOPT=-O
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 = -Wl,-Bstatic
DYNAMIC = -Wl,-Bdynamic