folkslinux
/
zfs
mirror of https://github.com/openzfs/zfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use $target_cpu instead of `arch` 

We should not be using arch for a few reasons.  First off it might
not be installed on their system, and secondly they may be trying
to cross-compile.
This commit is contained in:
Brian Behlendorf 2010-07-01 13:27:30 -07:00
parent 8fd4e3af2e
commit e2d28a3743
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/spl-build.m4
View File

@ -135,12 +135,12 @@ AC_DEFUN([SPL_AC_KERNEL], [
AC_MSG_RESULT([$kernelsrc])
AC_MSG_CHECKING([kernel build directory])
if test -z "$kernelbuild"; then
if test -d ${kernelsrc}-obj/`arch`/`arch`; then
kernelbuild=${kernelsrc}-obj/`arch`/`arch`
elif test -d ${kernelsrc}-obj/`arch`/default; then
kernelbuild=${kernelsrc}-obj/`arch`/default
elif test -d `dirname ${kernelsrc}`/build-`arch`; then
kernelbuild=`dirname ${kernelsrc}`/build-`arch`
if test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then
kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu}
elif test -d ${kernelsrc}-obj/${target_cpu}/default; then
kernelbuild=${kernelsrc}-obj/${target_cpu}/default
elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then
kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu}
else
kernelbuild=${kernelsrc}
fi

24
configure vendored
View File

@ -11530,12 +11530,12 @@ $as_echo "$kernelsrc" >&6; }
{ $as_echo "$as_me:$LINENO: checking kernel build directory" >&5
$as_echo_n "checking kernel build directory... " >&6; }
if test -z "$kernelbuild"; then
if test -d ${kernelsrc}-obj/`arch`/`arch`; then
kernelbuild=${kernelsrc}-obj/`arch`/`arch`
elif test -d ${kernelsrc}-obj/`arch`/default; then
kernelbuild=${kernelsrc}-obj/`arch`/default
elif test -d `dirname ${kernelsrc}`/build-`arch`; then
kernelbuild=`dirname ${kernelsrc}`/build-`arch`
if test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then
kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu}
elif test -d ${kernelsrc}-obj/${target_cpu}/default; then
kernelbuild=${kernelsrc}-obj/${target_cpu}/default
elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then
kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu}
else
kernelbuild=${kernelsrc}
fi
@ -15002,12 +15002,12 @@ $as_echo "$kernelsrc" >&6; }
{ $as_echo "$as_me:$LINENO: checking kernel build directory" >&5
$as_echo_n "checking kernel build directory... " >&6; }
if test -z "$kernelbuild"; then
if test -d ${kernelsrc}-obj/`arch`/`arch`; then
kernelbuild=${kernelsrc}-obj/`arch`/`arch`
elif test -d ${kernelsrc}-obj/`arch`/default; then
kernelbuild=${kernelsrc}-obj/`arch`/default
elif test -d `dirname ${kernelsrc}`/build-`arch`; then
kernelbuild=`dirname ${kernelsrc}`/build-`arch`
if test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then
kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu}
elif test -d ${kernelsrc}-obj/${target_cpu}/default; then
kernelbuild=${kernelsrc}-obj/${target_cpu}/default
elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then
kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu}
else
kernelbuild=${kernelsrc}
fi