From 39b34ab91b52e73531a2b549ae186bc3c757978c Mon Sep 17 00:00:00 2001
From: eb
Date: Thu, 2 Oct 2008 02:33:09 +0000
Subject: fix for "double cross-compilation"

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9696 221aa14e-8319-0410-a670-987f0aec2ac5
---
 configure-cell-cross         |  1 +
 usrp2/firmware/configure.gnu | 24 ++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/configure-cell-cross b/configure-cell-cross
index 6d6e7e542..6b65982bb 100755
--- a/configure-cell-cross
+++ b/configure-cell-cross
@@ -49,6 +49,7 @@ $scriptdir/configure			    \
     --with-pythondir=$prefix/lib/python${python_version}/site-packages			\
     --disable-gr-video-sdl \
     --disable-gr-audio-portaudio \
+    --disable-usrp2-firmware \
     "$@"
 
 
diff --git a/usrp2/firmware/configure.gnu b/usrp2/firmware/configure.gnu
index a63462a94..3420eced0 100755
--- a/usrp2/firmware/configure.gnu
+++ b/usrp2/firmware/configure.gnu
@@ -3,9 +3,29 @@
 # wrapper to setup cross-compilation of firmware
 #
 
-for v in CC CXX AR NM RANLIB STRIP F77 CPPFLAGS LDFLAGS 
+for v in CC CXX AR NM RANLIB STRIP F77 CFLAGS CXXFLAGS CPPFLAGS LDFLAGS 
 do
   unset $v
 done
 
-`dirname $0`/configure "$@" --host=mb
+args=
+for t in "$@"
+do
+  case "$t" in
+      (CC=*)       ;;
+      (CXX=*)      ;;
+      (AR=*)       ;;
+      (NM=*)       ;;
+      (RANLIB=*)   ;;
+      (STRIP=*)    ;;
+      (F77=*)      ;;
+      (CFLAGS=*)   ;;
+      (CXXFLAGS=*) ;;
+      (CPPFLAGS=*) ;;
+      (LDFLAGS=*)  ;;
+      (*)  args="$args $t" ;;
+  esac
+done
+
+
+`dirname $0`/configure $args --host=mb
-- 
cgit