# HG changeset patch # User David Holsgrove # Date 1349243962 -36000 # Node ID 5243d1b432b141704146a8f8c2b13362729f6592 # Parent 24c8bae2216f3223064d16cbf7cd85a3931a0e31 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" Signed-off-by: Bryan Hundven Message-Id: <4c4410a2a8aab24a29c5.1349244128@localhost.localdomain> PatchWork-Id: 188711 diff -r 24c8bae2216f -r 5243d1b432b1 scripts/build/debug/300-gdb.sh --- a/scripts/build/debug/300-gdb.sh Thu Oct 11 14:37:45 2012 +1000 +++ 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[@]}"