From 2f55fe3ac2041f308c3e0a196654cfe716aa07fe Mon Sep 17 00:00:00 2001
From: jacob <jacob>
Date: Thu, 6 Jan 2005 03:40:00 +0000
Subject: [PATCH] b=5278

add -m64 to CC, not EXTRA_KCFLAGS as that doesn't get passed to the
"stage two" of module building
---
 build/autoconf/lustre-build.m4 | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 2e1cdd1..701f448 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -345,14 +345,13 @@ if test $ac_cv_sizeof_unsigned_long_long != 8 ; then
 fi
 
 AC_MSG_CHECKING([if $CC accepts -m64])
-CFLAGS_save="$CFLAGS"
-CFLAGS="-m64 $CFLAGS"
+CC_save="$CC"
+CC="$CC -m64"
 AC_TRY_COMPILE([],[],[
 	AC_MSG_RESULT([yes])
-	EXTRA_KCFLAGS="-m64 $EXTRA_KCFLAGS"
 ],[
 	AC_MSG_RESULT([no])
-	CFLAGS="$CFLAGS_save"
+	CC="$CC_save"
 ])
 
 CPPFLAGS="-I\$(top_builddir)/portals/include -I\$(top_srcdir)/portals/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
@@ -448,11 +447,13 @@ AC_OUTPUT
 
 cat <<_ACEOF
 
-CPPFLAGS: $CPPFLAGS
-LLCPPFLAGS: $LLCPPFLAGS
-CFLAGS: $CFLAGS
+CC:            $CC
+LD:            $LD
+CPPFLAGS:      $CPPFLAGS
+LLCPPFLAGS:    $LLCPPFLAGS
+CFLAGS:        $CFLAGS
 EXTRA_KCFLAGS: $EXTRA_KCFLAGS
-LLCFLAGS: $LLCFLAGS
+LLCFLAGS:      $LLCFLAGS
 
 Type 'make' to build Lustre.
 _ACEOF
-- 
1.8.3.1