From 995f79ddbc17e3c248d823259e1eb43f400c1f77 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Wed, 2 Jul 2014 09:21:16 +0000
Subject: [PATCH] conflict ARCH variable
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5459 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
targets/PROJECTS/GENERIC-LTE-EPC/utils.bash | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
index f9e84833ce..05cf10becd 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
@@ -489,7 +489,7 @@ check_install_epc_software() {
test_install_package libblas
test_install_package libblas-dev
if [ x$DISTRIB_RELEASE == x12.04 ]; then
- if [ x$ARCH == x64 ]; then
+ if [ x$UTILS_ARCH == x64 ]; then
test_install_package libconfig8-dev
else
test_install_package libconfig-dev
@@ -699,7 +699,7 @@ cecho "OPENAIR3_DIR = $OPENAIR3_DIR" $green
cecho "OPENAIRCN_DIR = $OPENAIRCN_DIR" $green
cecho "OPENAIR_TARGETS = $OPENAIR_TARGETS" $green
-export ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
+export UTILS_ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
if [ -f /etc/lsb-release ]; then
. /etc/lsb-release
export OS=$DISTRIB_ID
--
GitLab