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

diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4
index 8b96dfb..a14ebf8 100644
--- a/build/autoconf/lustre-build-darwin.m4
+++ b/build/autoconf/lustre-build-darwin.m4
@@ -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