From 2162cbbdb7a425505e66f8b65f134c33302324f4 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 16 Mar 2016 11:41:55 -0700
Subject: Work-around another quirk in GDB configure.

Previous fix for cross-gdb broke powerpc-unknown_nofpu-linux-gnu which
uses an old GDB (6.8a). That GDB's configure chokes on $CC values with
multiple consecutive spaces; see the comment in 300-gdb.sh.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 02a8f7e..ee4753e 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -99,10 +99,17 @@ do_debug_gdb_build() {
             LD_for_gdb+=" -static"
         fi
 
-    # Disable binutils options when building from the binutils-gdb repo.
-    cross_extra_config+=("--disable-binutils")
-    cross_extra_config+=("--disable-ld")
-    cross_extra_config+=("--disable-gas")
+        # Fix up whitespace. Some older GDB releases (e.g. 6.8a) get confused if there
+        # are multiple consecutive spaces: sub-configure scripts replace them with a
+        # single space and then complain that $CC value changed from that in
+        # the master directory.
+        CC_for_gdb=`echo $CC_for_gdb`
+        LD_for_gdb=`echo $LD_for_gdb`
+
+        # Disable binutils options when building from the binutils-gdb repo.
+        cross_extra_config+=("--disable-binutils")
+        cross_extra_config+=("--disable-ld")
+        cross_extra_config+=("--disable-gas")
 
         CT_DoLog DEBUG "Extra config passed: '${cross_extra_config[*]}'"
 
-- 
cgit v0.10.2-6-g49f6