summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreb2008-10-02 02:33:09 +0000
committereb2008-10-02 02:33:09 +0000
commit39b34ab91b52e73531a2b549ae186bc3c757978c (patch)
tree10b06cd4798695e94373ac54141e825ad9080213
parentd497b054a51bc049640c1d43cb54ca3d54ffdb4a (diff)
downloadgnuradio-39b34ab91b52e73531a2b549ae186bc3c757978c.tar.gz
gnuradio-39b34ab91b52e73531a2b549ae186bc3c757978c.tar.bz2
gnuradio-39b34ab91b52e73531a2b549ae186bc3c757978c.zip
fix for "double cross-compilation"
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9696 221aa14e-8319-0410-a670-987f0aec2ac5
-rwxr-xr-xconfigure-cell-cross1
-rwxr-xr-xusrp2/firmware/configure.gnu24
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