[PATCH] scripts/gdb: If not building expat for gdb, disable

[David Holsgrove <david dot holsgrove at xilinx dot com>]

# HG changeset patch
# User David Holsgrove <david.holsgrove@xilinx.com>
# Date 1349243962 -36000
# Node ID 4c4410a2a8aab24a29c5843f002b2355d91f556c
# Parent  43ace4bb005eef085437e3d4fbaef528ef0ef005
scripts/gdb: If not building expat for gdb, disable

--with-expat=yes is unconditionally passed to the gdb configure
stage, instead of respecting the ${do_expat} decision.

Disable if not needed. Prevents error building canadian cross;

configure: error: expat is missing or unusable

Where configure stage fails to find expat on the host compiler.

Signed-off-by: "David Holsgrove" <david.holsgrove@xilinx.com>

diff -r 43ace4bb005e -r 4c4410a2a8aa scripts/build/debug/300-gdb.sh
--- a/scripts/build/debug/300-gdb.sh	Wed Sep 26 16:37:31 2012 +0200
+++ b/scripts/build/debug/300-gdb.sh	Wed Oct 03 15:59:22 2012 +1000
@@ -136,6 +136,13 @@
             LD_for_gdb="ld -static"
         fi
 
+        if [ "${do_expat}" = "y" ]; then
+            cross_extra_config+=("--with-expat=yes")
+        else
+            cross_extra_config+=("--disable-expat")
+            cross_extra_config+=("--with-expat=no")
+        fi
+
         gdb_cross_configure="${gdb_src_dir}/configure"
 
         CT_DoLog DEBUG "Extra config passed: '${cross_extra_config[*]}'"
@@ -150,7 +157,6 @@
             --prefix="${CT_PREFIX_DIR}"                 \
             --with-build-sysroot="${CT_SYSROOT_DIR}"    \
             --with-sysroot="${CT_SYSROOT_DIR}"          \
-            --with-expat=yes                            \
             --disable-werror                            \
             "${cross_extra_config[@]}"                  \
             "${CT_GDB_CROSS_EXTRA_CONFIG_ARRAY[@]}"

--
For unsubscribe information see http://sourceware.org/lists.html#faq