[rds-commits] jlbec commits r102 - trunk

svn-commits@oss.oracle.com svn-commits at oss.oracle.com
Wed Jun 7 18:21:52 CDT 2006


Author: jlbec
Date: 2006-06-07 18:21:52 -0500 (Wed, 07 Jun 2006)
New Revision: 102

Modified:
   trunk/Makefile.in
   trunk/configure.in
Log:

Remove the gcc checks and assume your friendly neighborhood gcc just works.

Signed-off-by: Joel Becker <joel.becker at oracle.com>



Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	2006-06-07 21:03:38 UTC (rev 101)
+++ trunk/Makefile.in	2006-06-07 23:21:52 UTC (rev 102)
@@ -1,4 +1,7 @@
 all: kbuild-modules
+modules: kbuild-modules
+clean: kbuild-clean
+modules_install: kbuild-modules_install
 
 EXTRA_CFLAGS = "@DEBUG_CFLAGS@ @KAPI_COMPAT_CFLAGS@ -g -I$(CURDIR)/linux/include"
 SVN_REV := @SVN_REV@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-07 21:03:38 UTC (rev 101)
+++ trunk/configure.in	2006-06-07 23:21:52 UTC (rev 102)
@@ -1,7 +1,8 @@
 AC_PREREQ(2.55)
 AC_INIT(Makefile.in)
 
-KERNELCC=gcc
+KERNELCC=${KERNELCC:-gcc}
+AC_SUBST(KERNELCC)
 
 CONFIG_ARGS="$@"
 AC_SUBST(CONFIG_ARGS)
@@ -24,22 +25,7 @@
 AC_MSG_RESULT($SVN_REV)
 AC_SUBST(SVN_REV)
 
-AC_MSG_CHECKING(gcc version)
-gcc_version=$(gcc -v 2>&1 | tail -1)
-if echo "$gcc_version" | grep -q '\<4.0' 2>&1 > /dev/null; then
-	gcc_try_32=1
-fi
-AC_MSG_RESULT($gcc_version)
 
-if test x$gcc_try_32 == "x1"; then
-	AC_PATH_PROG(CC, gcc32)
-	if test x$CC == "x" ; then
-		AC_MSG_ERROR([sorry, gcc $gcc_version is broken and gcc32 wasn't found])
-	fi
-	KERNELCC=gcc32
-fi
-AC_SUBST(KERNELCC)
-
 AC_MSG_CHECKING(whether debugging is enabled)
 AC_ARG_ENABLE(debug, [  --enable-debug=[yes/no]         Turn on debugging [default=no]],,enable_debug=no)
 DEBUG_CFLAGS=""




More information about the rds-commits mailing list