X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build-darwin.m4;h=eeb93939ad5e75bc5796e7e81bdf6acf49712d6c;hp=8b96dfbf8997c15f35f4dbe1288816e22e00359e;hb=e14d4dd61348297f1627c65073a2d908e54977a3;hpb=76e07d3c57f75c16a9c998fb27adf692b6ff4fb6

diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4
index 8b96dfb..eeb9393 100644
--- a/build/autoconf/lustre-build-darwin.m4
+++ b/build/autoconf/lustre-build-darwin.m4
@@ -13,10 +13,10 @@ do
 AC_MSG_CHECKING([for $1])
 AS_IF([AC_TRY_COMMAND(nm /mach | grep "[$1]" >/dev/null 2>/dev/null)],[
 	AC_MSG_RESULT([yes])
-	AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$ac_func])]) $2
+	AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$ac_func])) $2
 ],[
 	AC_MSG_RESULT([no]) $3
-])dnl
+])
 done
 ])
 
@@ -49,9 +49,14 @@ case $target_cpu in
 		EXTRA_KLDFLAGS="-arch i386"
 		;;
 esac
+
+# Kernel of OS X is not 64bits(even in Tiger), but -m64 can be taken by gcc in Tiger
+# (Tiger can support 64bits applications), so we have to eliminate -m64 while 
+# building kextensions for and OS X.
+CC=`echo $CC | sed -e "s/\-m64//g"`
 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -x c -pipe -Wno-trigraphs -fasm-blocks -g -O0"
 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Wno-four-char-constants -Wmost -O0"
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -fmessage-length=0 -ffix-and-continue"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -fmessage-length=0"
 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/Headers"
 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/Headers/bsd"
 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -I$kernel_framework/PrivateHeaders"
@@ -70,7 +75,7 @@ case $target_os in
                 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN8__"
 	;;
         darwin7*)
-                EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN7__"
+                EXTRA_KCFLAGS="$EXTRA_KCFLAGS -ffix-and-continue"
         ;;
 esac
 
@@ -93,6 +98,8 @@ AC_SUBST(kextdir)
 AC_SUBST(plistdir)
 AC_SUBST(macosdir)
 
+LN_PROG_DARWIN
+
 LP_PROG_DARWIN
 
 LC_PROG_DARWIN