Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32498/buildtools/conf
Modified Files:
Tag: MonetDB_1-20
MonetDB.m4
Log Message:
make sure we identify non-GNU compilers ("$GCC"=="") on Linux (i.e., icc & pgcc)
by their command names, also in case $CC contains a prefix,
e.g., a path or an architecture specification
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.37.2.17
retrieving revision 1.37.2.18
diff -u -d -r1.37.2.17 -r1.37.2.18
--- MonetDB.m4 22 Nov 2007 14:06:27 -0000 1.37.2.17
+++ MonetDB.m4 22 Nov 2007 15:44:17 -0000 1.37.2.18
@@ -474,7 +474,7 @@
case "$GCC-$CC-$enableval" in
*-*-$native_bits)
;;
--icc*-*)
+-*icc*-*)
AC_MSG_ERROR([icc does not support a command line option to switch
between 32- & 64-bit compilation; please use CC & PATH (instead of
--enable-bits=$enableval) to point to the $enableval-bit version of icc])
;;
*-*-32|*-*-64)
@@ -517,7 +517,7 @@
yes-*-linux*-x86_64*-*)
CC="$CC -m$bits"
;;
--pgcc*-linux*-x86_64*-*)
+-*pgcc*-linux*-x86_64*-*)
CC="$CC -tp=k8-$bits"
;;
yes-*-darwin8*-powerpc*-*)
@@ -617,7 +617,7 @@
;;
esac
;;
--icc*-linux*|-ecc*-linux*|-pgcc*-linux*)
+-*icc*-linux*|-*ecc*-linux*|-*pgcc*-linux*)
dnl Define the same settings as for gcc, as we use the same
dnl header files
AC_DEFINE(_POSIX_C_SOURCE, 200112L, [Compiler flag])
@@ -759,7 +759,7 @@
NO_INLINE_CFLAGS="-fno-inline -fno-inline-functions"
;;
--icc*-linux*|-ecc*-linux*)
+-*icc*-linux*|-*ecc*-linux*)
dnl Intel ([ie]cc/[ie]cpc on Linux)
LDFLAGS="$LDFLAGS -i_dynamic"
dnl Let warning #140 "too many arguments in function call"
@@ -839,7 +839,7 @@
NO_INLINE_CFLAGS="-fno-inline -fno-inline-functions"
;;
--pgcc*-linux*)
+-*pgcc*-linux*)
dnl Portland Group (PGI) (pgcc/pgCC on Linux)
dnl required for "scale" in module "decimal"
CFLAGS="$CFLAGS -Msignextend"
@@ -891,13 +891,13 @@
;;
esac
;;
--icc*-linux*|-ecc*-linux*)
+-*icc*-linux*|-*ecc*-linux*)
case "$host-$icc_ver" in
*-*-*-10.*) CFLAGS="$CFLAGS -std=c99" ;;
*-*-*-*) CFLAGS="$CFLAGS -c99" ;;
esac
;;
--pgcc*-linux*)
+-*pgcc*-linux*)
CFLAGS="$CFLAGS -c9x"
;;
esac
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
