# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1214430996 0
# Node ID 259d3b95bfad24b0c4e90ebc695107ebff14a5d1
# Parent  e2c8f427c140b93628197f217fd958eed6634851
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 -r e2c8f427c140 -r 259d3b95bfad config/debug/gdb.in
--- a/config/debug/gdb.in	Wed Jun 25 20:56:50 2008 +0000
+++ b/config/debug/gdb.in	Wed Jun 25 21:56:36 2008 +0000
@@ -33,7 +33,6 @@
     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 @@
       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_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 -r e2c8f427c140 -r 259d3b95bfad scripts/build/debug/300-gdb.sh
--- a/scripts/build/debug/300-gdb.sh	Wed Jun 25 20:56:50 2008 +0000
+++ b/scripts/build/debug/300-gdb.sh	Wed Jun 25 21:56:36 2008 +0000
@@ -132,7 +132,7 @@
             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