diff options
| -rw-r--r-- | config/companion_libs.in (renamed from config/gmp_mpfr.in) | 17 | ||||
| -rw-r--r-- | config/companion_libs/gmp.in (renamed from config/gmp_mpfr/gmp.in) | 0 | ||||
| -rw-r--r-- | config/companion_libs/mpfr.in (renamed from config/gmp_mpfr/mpfr.in) | 0 | ||||
| -rw-r--r-- | config/config.in | 2 | ||||
| -rwxr-xr-x | scripts/addToolVersion.sh | 4 | ||||
| -rw-r--r-- | scripts/build/companion_libs/gmp.sh (renamed from scripts/build/gmp.sh) | 0 | ||||
| -rw-r--r-- | scripts/build/companion_libs/mpfr.sh (renamed from scripts/build/mpfr.sh) | 0 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 4 |
8 files changed, 15 insertions, 12 deletions
diff --git a/config/gmp_mpfr.in b/config/companion_libs.in index 02afb769..49dc6629 100644 --- a/config/gmp_mpfr.in +++ b/config/companion_libs.in @@ -1,16 +1,19 @@ -# GMP and MPFR libraries config options +# Companion libraries config options +# Those libraries are required for different versions of gcc, +# and can be used by binutils and gdb (maybe others as well). -menu "GMP and MPFR" +menu "Companion libraries" config GMP_MPFR bool prompt "GMP and MPFR" help - Recent gcc needs both GMP and MPFR to build some frontends. - + gcc 4.3.0 and above requires both GMP and MPFR to build some frontends, + and some other components can use them as well (eg. binutils and gdb). + Say 'Y' here if you want to build those two libraries specifically for crosstool-NG. - + The packages that can use GMP and MPFR are: - binutils - gcc @@ -28,8 +31,8 @@ config GMP_MPFR_TARGET to run gdb natively on the target. if GMP_MPFR -source config/gmp_mpfr/gmp.in -source config/gmp_mpfr/mpfr.in +source config/companion_libs/gmp.in +source config/companion_libs/mpfr.in endif endmenu diff --git a/config/gmp_mpfr/gmp.in b/config/companion_libs/gmp.in index 0ac2b2c0..0ac2b2c0 100644 --- a/config/gmp_mpfr/gmp.in +++ b/config/companion_libs/gmp.in diff --git a/config/gmp_mpfr/mpfr.in b/config/companion_libs/mpfr.in index dcea3264..dcea3264 100644 --- a/config/gmp_mpfr/mpfr.in +++ b/config/companion_libs/mpfr.in diff --git a/config/config.in b/config/config.in index 16a62f28..14e1a411 100644 --- a/config/config.in +++ b/config/config.in @@ -2,7 +2,7 @@ source config/global.in source config/target.in source config/toolchain.in source config/kernel.in -source config/gmp_mpfr.in +source config/companion_libs.in source config/binutils.in source config/cc.in source config/libc.in diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 0f6bf034..21f4e9e0 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -131,8 +131,8 @@ while [ $# -gt 0 ]; do --strace) EXP=; OBS=; cat=STRACE; tool=strace; tool_prefix=debug;; --ltrace) EXP=; OBS=; cat=LTRACE; tool=ltrace; tool_prefix=debug;; --libelf) EXP=; OBS=; cat=LIBELF; tool=libelf; tool_prefix=tools;; - --gmp) EXP=; OBS=; cat=GMP; tool=gmp; tool_prefix=gmp_mpfr;; - --mpfr) EXP=; OBS=; cat=MPFR; tool=mpfr; tool_prefix=gmp_mpfr;; + --gmp) EXP=; OBS=; cat=GMP; tool=gmp; tool_prefix=companion_libs;; + --mpfr) EXP=; OBS=; cat=MPFR; tool=mpfr; tool_prefix=companion_libs;; # Tools options: -x|--experimental|+s) EXP=1;; diff --git a/scripts/build/gmp.sh b/scripts/build/companion_libs/gmp.sh index 51134da5..51134da5 100644 --- a/scripts/build/gmp.sh +++ b/scripts/build/companion_libs/gmp.sh diff --git a/scripts/build/mpfr.sh b/scripts/build/companion_libs/mpfr.sh index e302ff77..e302ff77 100644 --- a/scripts/build/mpfr.sh +++ b/scripts/build/companion_libs/mpfr.sh diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 04b39768..8b8ac4be 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -88,8 +88,8 @@ CT_DoLog INFO "Building environment variables" . "${CT_LIB_DIR}/scripts/build/internals.sh" . "${CT_LIB_DIR}/scripts/build/arch/${CT_ARCH}.sh" . "${CT_LIB_DIR}/scripts/build/kernel/${CT_KERNEL}.sh" -. "${CT_LIB_DIR}/scripts/build/gmp.sh" -. "${CT_LIB_DIR}/scripts/build/mpfr.sh" +. "${CT_LIB_DIR}/scripts/build/companion_libs/gmp.sh" +. "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh" . "${CT_LIB_DIR}/scripts/build/binutils.sh" . "${CT_LIB_DIR}/scripts/build/libc/${CT_LIBC}.sh" . "${CT_LIB_DIR}/scripts/build/cc/${CT_CC}.sh" |