X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=build%2Fautoconf%2Flustre-build-darwin.m4;h=eeb93939ad5e75bc5796e7e81bdf6acf49712d6c;hb=2c90cdfc2de97cbe93d34c93e646a3dd9b230a75;hp=fbe515ad64bafbf0d5a6493c3aa4d895525c653a;hpb=ec6a8ea1f2db68dbda7a51a10a4623ab26c9a17c;p=fs%2Flustre-release.git

diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4
index fbe515a..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"
@@ -68,8 +73,9 @@ EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__KERNEL__ -D__DARWIN__"
 case $target_os in
         darwin8*)
                 EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN8__"
+	;;
         darwin7*)
-                EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN7__"
+                EXTRA_KCFLAGS="$EXTRA_KCFLAGS -ffix-and-continue"
         ;;
 esac
 
@@ -92,6 +98,8 @@ AC_SUBST(kextdir)
 AC_SUBST(plistdir)
 AC_SUBST(macosdir)
 
+LN_PROG_DARWIN
+
 LP_PROG_DARWIN
 
 LC_PROG_DARWIN