Changeset: 2ead00e2bd38 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ead00e2bd38
Modified Files:
buildtools/conf/MonetDB.m4
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (36 lines):
diff -r 3f4d7d858285 -r 2ead00e2bd38 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Tue Dec 07 22:28:27 2010 +0100
+++ b/buildtools/conf/MonetDB.m4 Wed Dec 08 00:49:24 2010 +0100
@@ -1947,7 +1947,11 @@
JAVACFLAGS="`echo "$JAVACFLAGS" | sed -e 's| -g | |g' -e 's| -g:[[a-z]]* |
|g' -e 's|^ ||' -e 's| $||'`"
dnl Optimization flags
JAVACFLAGS="$JAVACFLAGS -g:none -O"
- if test "x$GCC" = xyes; then
+ case "$GCC-$CC" in
+ yes-*clang*)
+ CFLAGS="$CFLAGS -O3 -fomit-frame-pointer
-finline-functions"
+ ;;
+ yes-*)
dnl -fomit-frame-pointer crashes memprof
case "$host-$gcc_ver" in
x86_64-*-*-3.[[2-9]]*|i*86-*-*-3.[[2-9]]*|x86_64-*-*-4.*|i*86-*-*-4.*)
@@ -2006,7 +2010,8 @@
;;
*) CFLAGS="$CFLAGS -O6 -fomit-frame-pointer
-finline-functions";;
esac
- else
+ ;;
+ *)
case "$host-$icc_ver" in
dnl handle non-Intel compilers ($icc_ver=""), first
*solaris*-) CFLAGS="$CFLAGS -xO5"
@@ -2076,7 +2081,8 @@
dnl hence, we use only "-O2", here.
;;
esac
- fi
+ ;;
+ esac
changedCFLAGS=
for flag in $origCFLAGS ; do
case " $CFLAGS " in
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
