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
b=19188
[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
8cbc756
..
6f1be34
100644
(file)
--- a/
build/autoconf/lustre-build-darwin.m4
+++ b/
build/autoconf/lustre-build-darwin.m4
@@
-13,7
+13,7
@@
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
])dnl
],[
AC_MSG_RESULT([no]) $3
])dnl
@@
-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"
@@
-63,6
+68,18
@@
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DKERNEL -DKERNEL_PRIVATE"
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DDRIVER_PRIVATE -DAPPLE -DNeXT"
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__KERNEL__ -D__DARWIN__"
#
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -DDRIVER_PRIVATE -DAPPLE -DNeXT"
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__KERNEL__ -D__DARWIN__"
#
+# C flags for Panther/Tiger
+#
+case $target_os in
+ darwin8*)
+ EXTRA_KCFLAGS="$EXTRA_KCFLAGS -D__DARWIN8__"
+ ;;
+ darwin7*)
+ EXTRA_KCFLAGS="$EXTRA_KCFLAGS -ffix-and-continue"
+ ;;
+esac
+
+#
# Debugging flags. Remove!
#
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -O0 -DMACH_ASSERT=1"
# Debugging flags. Remove!
#
EXTRA_KCFLAGS="$EXTRA_KCFLAGS -O0 -DMACH_ASSERT=1"
@@
-81,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