Changeset: 49bf675968bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=49bf675968bf
Modified Files:
configure.ag
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (34 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -599,7 +599,7 @@
X_CFLAGS="$X_CFLAGS -Wjump-misses-init"
dnl these trigger a warning (-> error) with
clang (2.8) & gcc < 4.5
X_CFLAGS="$X_CFLAGS -Wunreachable-code"
- dnl clang (2.8) does not know these
+ dnl clang (2.8) & gcc < 4.3 do not know these
dnl these trigger a warning (-> error) with gcc
< 4.5
X_CFLAGS="$X_CFLAGS -Wlogical-op"
;;
@@ -702,12 +702,16 @@
dnl as locally as possbile via "-Wno-strict-aliasing
-Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-undef
-Wno-missing-field-initializers"
dnl (see also clients/perl/Cimpl/Makefile.ag).
GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-strict-aliasing
-Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-undef
-Wno-unused-value"
- case "$CC-$gcc_ver" in
- *clang*-*)
+ case "$CC" in
+ *clang*)
;;
- *-3.[[5-9]].*|*-[[4-9]].*)
- dnl clang (2.8) & gcc < 3.5 do not know this
- GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-logical-op"
+ *)
+ case "$gcc_ver" in
+ 4.[[3-9]].*|[[5-9]].*)
+ dnl clang (2.8) & gcc < 4.3 do not know this
+ GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-logical-op"
+ ;;
+ esac
case "$gcc_ver" in
3.[[5-9]].*|4.[[0-4]].*)
dnl 3.4 < gcc < 4.5 trigger a warning (-> error)
without this
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
