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.

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index 89b7162c3836d53ca4a5133b6e22eb342a546fe6..3bbfd0195ff90ddc40ff5bda42e75187f43432db 100644 (file)
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -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

diff --git a/configure b/configure
index 9d5d93542746c5cb18a9f1fcf6dc0ada3ec8db02..a7ff89e264018a835713a144a4348ae52c7630e8 100755 (executable)
--- a/configure
+++ b/configure
@@ -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