fix for "double cross-compilation"

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9696 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/configure-cell-cross b/configure-cell-cross
index 6d6e7e542060661a02921726bb3bd9ec8e3e65f5..6b65982bb23866e0abeece6fce0d938298387cec 100755 (executable)
--- 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 a63462a94c36d5e4216748a2946264f4fe4ff973..3420eced03086b61d69680ff6b16e615f8ff2800 100755 (executable)
--- 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