From f6eeea18810f299baf1b31bbb896f3a7f762a3f1 Mon Sep 17 00:00:00 2001
From: David Holsgrove <david.holsgrove@xilinx.com>
Date: Wed, 3 Oct 2012 15:59:22 +1000
Subject: 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>
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Message-Id: <4c4410a2a8aab24a29c5.1349244128@localhost.localdomain>
PatchWork-Id: 188711

diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index f7b4d1e..f990e96 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -136,6 +136,13 @@ do_debug_gdb_build() {
             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 @@ do_debug_gdb_build() {
             --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[@]}"
-- 
cgit v0.10.2-6-g49f6