diff options
| -rw-r--r-- | config/binutils/binutils.in | 2 | ||||
| -rw-r--r-- | config/companion_libs.in | 19 | ||||
| -rw-r--r-- | config/debug/gdb.in | 2 | ||||
| -rw-r--r-- | scripts/build/binutils/binutils.sh | 2 | ||||
| -rw-r--r-- | scripts/build/companion_libs/gmp.sh | 4 | ||||
| -rw-r--r-- | scripts/build/companion_libs/mpfr.sh | 4 |
6 files changed, 22 insertions, 11 deletions
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 23063b0..2b6df6e 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -81,7 +81,7 @@ config BINUTILS_TARGET_USE_GMP_MPFR default n select GMP select MPFR - select COMP_LIBS_TARGET + select COMPLIBS_TARGET help binutils can be configured to use GMP and MPFR. While this is automatically handled for the cross-binutils, diff --git a/config/companion_libs.in b/config/companion_libs.in index 3bc019b..346b6ab 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -6,6 +6,10 @@ menu "Companion libraries" comment "FIXME: check real dependencies!!!" +config COMPLIBS + bool + default n + config WRAPPER_NEEDED bool default n @@ -13,6 +17,7 @@ config WRAPPER_NEEDED config GMP bool prompt "GMP" + select COMPLIBS select WRAPPER_NEEDED help gcc 4.3.0 and above requires GMP to build some frontends, and some @@ -31,6 +36,7 @@ config MPFR bool prompt "MPFR" select GMP + select COMPLIBS select WRAPPER_NEEDED help gcc 4.3.0 and above requires MPFR to build some frontends, and some @@ -50,6 +56,7 @@ config PPL prompt "PPL" select GMP select MPFR + select COMPLIBS select WRAPPER_NEEDED help gcc-4.4.0 and above requires PPL to build some parts of the optimiser @@ -65,6 +72,7 @@ config CLOOG select GMP select MPFR select PPL + select COMPLIBS select WRAPPER_NEEDED help gcc-4.4.0 and above requires CLooG/PPL to build some parts of the @@ -81,6 +89,7 @@ config MPC select MPFR select PPL select CLOOG + select COMPLIBS select WRAPPER_NEEDED help gcc-4.4.0 and above can also optionally use MPC to enable additional @@ -111,12 +120,13 @@ config FOO bool comment "Companion libraries common options" - depends on GMP || MPFR || PPL || CLOOG || MPC + depends on COMPLIBS || WRAPPER_NEEDED + +if COMPLIBS config COMP_LIBS_CHECK bool prompt "| Check the companion libraries builds (!!! READ HELP!!!)" - depends on GMP || MPFR || PPL || CLOOG || MPC default n help It is highly recommended to check the newly built companion libraries. @@ -132,10 +142,9 @@ config COMP_LIBS_CHECK building PPL on my machine takes roughly 1'40", while checking it takes about 1h40'... -config COMP_LIBS_TARGET +config COMPLIBS_TARGET bool prompt "| Build companion libraries for the target" - depends on GMP || MPFR || PPL || CLOOG || MPC depends on ! BARE_METAL default n help @@ -145,6 +154,8 @@ config COMP_LIBS_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 --git a/config/debug/gdb.in b/config/debug/gdb.in index db40dbb..60efbc4 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -60,7 +60,7 @@ config GDB_NATIVE_USE_GMP_MPFR depends on GDB_NATIVE select GMP select MPFR - select COMP_LIBS_TARGET + select COMPLIBS_TARGET help gdb can make use of the GMP and MPFR libraries. diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index fb653f6..2f4bbbd 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -84,7 +84,7 @@ do_binutils_target() { done # If GMP and MPFR were configured, then use that - if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then + if [ "${CT_BINUTILS_TARGET_USE_GMP_MPFR}" = "y" ]; then extra_config+=("--with-gmp=${CT_SYSROOT_DIR}/usr") extra_config+=("--with-mpfr=${CT_SYSROOT_DIR}/usr") fi diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh index 2155cb9..351c2fa 100644 --- a/scripts/build/companion_libs/gmp.sh +++ b/scripts/build/companion_libs/gmp.sh @@ -56,7 +56,7 @@ do_gmp() { CT_EndStep } -if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then +if [ "${CT_COMPLIBS_TARGET}" = "y" ]; then do_gmp_target() { mkdir -p "${CT_BUILD_DIR}/build-gmp-target" @@ -87,6 +87,6 @@ do_gmp_target() { CT_EndStep } -fi # CT_COMP_LIBS_TARGET == y +fi # CT_COMPLIBS_TARGET == y fi # CT_GMP == y diff --git a/scripts/build/companion_libs/mpfr.sh b/scripts/build/companion_libs/mpfr.sh index b76161a..5e91e1a 100644 --- a/scripts/build/companion_libs/mpfr.sh +++ b/scripts/build/companion_libs/mpfr.sh @@ -106,7 +106,7 @@ do_mpfr() { CT_EndStep } -if [ "${CT_COMP_LIBS_TARGET}" = "y" ]; then +if [ "${CT_COMPLIBS_TARGET}" = "y" ]; then do_mpfr_target() { mkdir -p "${CT_BUILD_DIR}/build-mpfr-target" @@ -145,6 +145,6 @@ do_mpfr_target() { CT_EndStep } -fi # CT_COMP_LIBS_TARGET == y +fi # CT_COMPLIBS_TARGET == y fi # CT_MPFR == y |