From 501143cea73f072acbbce0547ea1c8a1bc621d36 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Wed, 25 Jun 2008 21:56:36 +0000
Subject: Don't force building target GMP and MPFR when a native gdb is built.
 Rather, add a config knob to configure the native gdb to use or not to use
 GMP and MPFR; _this_config_knob_ will force building the target GMP and MPFR
 only if turned on.

 /trunk/scripts/build/debug/300-gdb.sh |    2     1     1     0 +-
 /trunk/config/debug/gdb.in            |   21    19     2     0 +++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index d2ce15e..990633a 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -33,7 +33,6 @@ config GDB_NATIVE
     bool
     prompt "Native gdb"
     default n
-    select GMP_MPFR_TARGET if GMP_MPFR
     help
       Build and install a native gdb for the target, to run on the target.
 
@@ -46,6 +45,24 @@ config GDB_NATIVE_STATIC
       In case you have trouble with dynamic loading of shared libraries,
       you will find that a static gdb comes in handy.
 
+config GDB_NATIVE_USE_GMP_MPFR
+    bool
+    prompt "Use GMP and MPFR (EXPERIMENTAL)"
+    default n
+    depends on EXPERIMENTAL
+    depends on GDB_NATIVE
+    select GMP_MPFR
+    select GMP_MPFR_TARGET
+    help
+      gdb can make use of the GMP and MPFR libraries.
+
+      While the cross-gdb (above) can use the libraries compiled for the
+      host, the native gdb needs the libraries for the target (where it will
+      eventually run).
+
+      Setting this option will force building the GMP and MPFR libraries for
+      the target, and configure the native gdb to use them.
+
 config GDB_GDBSERVER
     bool
     prompt "gdbserver"
@@ -56,7 +73,7 @@ config GDB_GDBSERVER
 config GDB_GDBSERVER_STATIC
     bool
     prompt "Build a static gdbserver"
-    default n
+    default y
     depends on GDB_GDBSERVER
     help
       In case you have trouble with dynamic loading of shared libraries,
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index bd43b23..e3f84c9 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -132,7 +132,7 @@ do_debug_gdb_build() {
             none)   native_extra_config="${native_extra_config} --disable-threads";;
             *)      native_extra_config="${native_extra_config} --enable-threads";;
         esac
-        if [ "${CT_GMP_MPFR_TARGET}" = "y" ]; then
+        if [ "${CT_GDB_NATIVE_USE_GMP_MPFR}" = "y" ]; then
             native_extra_config="${native_extra_config} --with-gmp=${CT_SYSROOT_DIR}/usr --with-mpfr=${CT_SYSROOT_DIR}/usr"
         fi
 
-- 
cgit v0.10.2-6-g49f6