From 972d3f5de84f0282d04d3afa60d2785c65c9a140 Mon Sep 17 00:00:00 2001
From: Dmitry Eremin <dmitry.eremin@intel.com>
Date: Mon, 3 Mar 2014 19:06:04 +0400
Subject: [PATCH] LU-2982 build: make AC check for linux arch sandbox friendly

I didn't found any usage of LINUXARCH definition in sources now.
But this check is problematic in sandbox. Therefore, I removed
it from sources at all.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: Ibdf0a3c26950a59d7f9cc51687d725d9c8835374
Reviewed-on: http://review.whamcloud.com/9458
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Alexey Shvetsov <alexxy@gentoo.org>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 build/Makefile               | 10 +---------
 config/lustre-build-linux.m4 | 16 ----------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/build/Makefile b/build/Makefile
index d00981f..d732afc 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -10,8 +10,6 @@
 # 3.  At configure time, as the toplevel module dir for building
 #     kernel tests
 #
-# 4.  At configure time, to determine the kernel's idea of $(ARCH)
-#
 
 ifeq ($(PATCHLEVEL),)
 
@@ -32,8 +30,7 @@ endif # LUSTRE_LINUX_CONFIG
 
 else # PATCHLEVEL
 
-# case 3
-
+# case #3
 ifneq ($(LUSTRE_KERNEL_TEST),)
 extra-y = $(LUSTRE_KERNEL_TEST)
 endif
@@ -41,8 +38,3 @@ endif
 obj-m := conftest.o
 
 endif # PATCHLEVEL
-
-# case 4
-
-echoarch:
-	echo $(ARCH) >$(ARCHFILE)
diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index 416cb66..ce0de5e 100644
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -406,21 +406,6 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.
 ])
 
 #
-# LB_LINUX_ARCH
-#
-# Determine the kernel's idea of the current architecture
-#
-AC_DEFUN([LB_LINUX_ARCH],
-         [AC_MSG_CHECKING([Linux kernel architecture])
-          AS_IF([rm -f $PWD/build/arch
-                 make -s --no-print-directory echoarch -f $PWD/build/Makefile \
-                     LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -C $LINUX $CROSS_VARS  \
-                     ARCHFILE=$PWD/build/arch && LINUX_ARCH=`cat $PWD/build/arch`],
-                [AC_MSG_RESULT([$LINUX_ARCH])],
-                [AC_MSG_ERROR([Could not determine the kernel architecture.])])
-          rm -f build/arch])
-
-#
 # LB_LINUX_TRY_COMPILE
 #
 # like AC_TRY_COMPILE
@@ -525,7 +510,6 @@ Kernel module loading support is highly recommended.
 #
 AC_DEFUN([LB_PROG_LINUX],
 [LB_LINUX_PATH
-LB_LINUX_ARCH
 LB_LINUX_SYMVERFILE
 
 
-- 
1.8.3.1