Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-506 kernel: FC15 - small changes
[fs/lustre-release.git]
/
build
/
autoconf
/
lustre-build-darwin.m4
diff --git
a/build/autoconf/lustre-build-darwin.m4
b/build/autoconf/lustre-build-darwin.m4
index
fbe515a
..
eeb9393
100644
(file)
--- 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_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
],[
AC_MSG_RESULT([no]) $3
-])
dnl
+])
done
])
done
])
@@
-49,9
+49,14
@@
case $target_cpu in
EXTRA_KLDFLAGS="-arch i386"
;;
esac
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 -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"
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__"
case $target_os in
darwin8*)
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN8__"
+ ;;
darwin7*)
darwin7*)
- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -
D__DARWIN7__
"
+ EXTRA_KCFLAGS="$EXTRA_KCFLAGS -
ffix-and-continue
"
;;
esac
;;
esac
@@
-92,6
+98,8
@@
AC_SUBST(kextdir)
AC_SUBST(plistdir)
AC_SUBST(macosdir)
AC_SUBST(plistdir)
AC_SUBST(macosdir)
+LN_PROG_DARWIN
+
LP_PROG_DARWIN
LC_PROG_DARWIN
LP_PROG_DARWIN
LC_PROG_DARWIN