# HG changeset patch # User "Yann E. MORIN" # Date 1266447049 -3600 # Node ID e44f67656c5f577bb52ea7566ac9c45838eb33f5 # Parent b488b4815f9b62dac904541b890b80a13da58b59 complibs: hide companion libraries for target entry The companion libraries on the target are required only for internal use by binutils and gdb. The user should not have to know about this, so hide the option. diff -r b488b4815f9b -r e44f67656c5f config/binutils/binutils.in --- a/config/binutils/binutils.in Thu Feb 18 20:43:31 2010 +0100 +++ b/config/binutils/binutils.in Wed Feb 17 23:50:49 2010 +0100 @@ -79,9 +79,8 @@ bool prompt "Use GMP and MPFR" default n - select GMP - select MPFR - select COMPLIBS_TARGET + select GMP_TARGET + select MPFR_TARGET help binutils can be configured to use GMP and MPFR. While this is automatically handled for the cross-binutils, diff -r b488b4815f9b -r e44f67656c5f config/companion_libs.in --- a/config/companion_libs.in Thu Feb 18 20:43:31 2010 +0100 +++ b/config/companion_libs.in Wed Feb 17 23:50:49 2010 +0100 @@ -100,19 +100,54 @@ can say 'Y' here, although it is unknown yet if any other component can use it. -if GMP +config GMP_TARGET + bool + +config MPFR_TARGET + bool + select GMP_TARGET + +config PPL_TARGET + bool + select GMP_TARGET + select MPFR_TARGET + +config CLOOG_TARGET + bool + select GMP_TARGET + select MPFR_TARGET + select PPL_TARGET + +config MPC_TARGET + bool + select GMP_TARGET + select MPFR_TARGET + select PPL_TARGET + select CLOOG_TARGET + +if GMP || GMP_TARGET +comment "GMP version needed to build for target" + depends on !GMP source config/companion_libs/gmp.in endif -if MPFR +if MPFR || MPFR_TARGET +comment "MPFR version needed to build for target" + depends on !MPFR source config/companion_libs/mpfr.in endif -if PPL +if PPL || PPL_TARGET +comment "PPL version needed to build for target" + depends on !PPL source config/companion_libs/ppl.in endif -if CLOOG +if CLOOG || CLOOG_TARGET +comment "CLOOG version needed to build for target" + depends on !CLOOG source config/companion_libs/cloog.in endif -if MPC +if MPC || MPC_TARGET +comment "MPC version needed to build for target" + depends on !MPC source config/companion_libs/mpc.in endif @@ -122,12 +157,11 @@ comment "Companion libraries common options" depends on COMPLIBS || WRAPPER_NEEDED -if COMPLIBS - config COMP_LIBS_CHECK bool prompt "| Check the companion libraries builds (!!! READ HELP!!!)" default n + depends on COMPLIBS help It is highly recommended to check the newly built companion libraries. Unfortunately, this is a very intensive task, and takes a loooong time. @@ -142,20 +176,6 @@ building PPL on my machine takes roughly 1'40", while checking it takes about 1h40'... -config COMPLIBS_TARGET - bool - prompt "| Build companion libraries for the target" - depends on ! BARE_METAL - default n - help - Also build companion libraries for the target. This can be usefull if - you want to later build a compiler that will run on the target, or if - you want to run gdb natively on the target. - - Please note that for now, crosstool-NG can only build GMP and MPFR so. - -endif # COMPLIBS - choice bool prompt "| Install tools wrapper as:" diff -r b488b4815f9b -r e44f67656c5f config/debug/gdb.in --- a/config/debug/gdb.in Thu Feb 18 20:43:31 2010 +0100 +++ b/config/debug/gdb.in Wed Feb 17 23:50:49 2010 +0100 @@ -58,9 +58,8 @@ prompt "Use GMP and MPFR" default n depends on GDB_NATIVE - select GMP - select MPFR - select COMPLIBS_TARGET + select GMP_TARGET + select MPFR_TARGET help gdb can make use of the GMP and MPFR libraries. diff -r b488b4815f9b -r e44f67656c5f scripts/build/companion_libs/gmp.sh --- a/scripts/build/companion_libs/gmp.sh Thu Feb 18 20:43:31 2010 +0100 +++ b/scripts/build/companion_libs/gmp.sh Wed Feb 17 23:50:49 2010 +0100 @@ -8,7 +8,7 @@ do_gmp_target() { :; } # Overide functions depending on configuration -if [ "${CT_GMP}" = "y" ]; then +if [ "${CT_GMP}" = "y" -o "${CT_GMP_TARGET}" = "y" ]; then # Download GMP do_gmp_get() { @@ -21,6 +21,8 @@ CT_Patch "gmp-${CT_GMP_VERSION}" } +if [ "${CT_GMP}" = "y" ]; then + do_gmp() { mkdir -p "${CT_BUILD_DIR}/build-gmp" @@ -56,7 +58,9 @@ CT_EndStep } -if [ "${CT_COMPLIBS_TARGET}" = "y" ]; then +fi # CT_GMP + +if [ "${CT_GMP_TARGET}" = "y" ]; then do_gmp_target() { mkdir -p "${CT_BUILD_DIR}/build-gmp-target" @@ -87,6 +91,6 @@ CT_EndStep } -fi # CT_COMPLIBS_TARGET == y +fi # CT_GMP_TARGET -fi # CT_GMP == y +fi # CT_GMP || CT_GMP_TARGET diff -r b488b4815f9b -r e44f67656c5f scripts/build/companion_libs/mpfr.sh --- a/scripts/build/companion_libs/mpfr.sh Thu Feb 18 20:43:31 2010 +0100 +++ b/scripts/build/companion_libs/mpfr.sh Wed Feb 17 23:50:49 2010 +0100 @@ -8,7 +8,7 @@ do_mpfr_target() { :; } # Overide function depending on configuration -if [ "${CT_MPFR}" = "y" ]; then +if [ "${CT_MPFR}" = "y" -o "${CT_MPFR_TARGET}" = "y" ]; then # Download MPFR do_mpfr_get() { @@ -64,6 +64,8 @@ esac } +if [ "${CT_MPFR}" = "y" ]; then + do_mpfr() { mkdir -p "${CT_BUILD_DIR}/build-mpfr" cd "${CT_BUILD_DIR}/build-mpfr" @@ -106,7 +108,9 @@ CT_EndStep } -if [ "${CT_COMPLIBS_TARGET}" = "y" ]; then +fi # CT_MPFR + +if [ "${CT_MPFR_TARGET}" = "y" ]; then do_mpfr_target() { mkdir -p "${CT_BUILD_DIR}/build-mpfr-target" @@ -145,6 +149,6 @@ CT_EndStep } -fi # CT_COMPLIBS_TARGET == y +fi # CT_MPFR_TARGET -fi # CT_MPFR == y +fi # CT_MPFR || CT_MPFR_TARGET diff -r b488b4815f9b -r e44f67656c5f scripts/build/debug/300-gdb.sh --- a/scripts/build/debug/300-gdb.sh Thu Feb 18 20:43:31 2010 +0100 +++ b/scripts/build/debug/300-gdb.sh Wed Feb 17 23:50:49 2010 +0100 @@ -224,7 +224,8 @@ *) native_extra_config+=("--enable-threads");; esac if [ "${CT_GDB_NATIVE_USE_GMP_MPFR}" = "y" ]; then - native_extra_config+=("--with-gmp=${CT_SYSROOT_DIR}/usr" "--with-mpfr=${CT_SYSROOT_DIR}/usr") + native_extra_config+=("--with-gmp=${CT_SYSROOT_DIR}/usr") + native_extra_config+=("--with-mpfr=${CT_SYSROOT_DIR}/usr") fi if [ "${CT_GDB_NATIVE_STATIC}" = "y" ]; then