diff options
Diffstat (limited to 'scripts/build')
-rw-r--r-- | scripts/build/binutils.sh | 2 | ||||
-rw-r--r-- | scripts/build/cc_gcc.sh | 6 | ||||
-rw-r--r-- | scripts/build/debug/300-gdb.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/binutils.sh b/scripts/build/binutils.sh index 29f4fb7..59c8510 100644 --- a/scripts/build/binutils.sh +++ b/scripts/build/binutils.sh @@ -27,7 +27,7 @@ do_binutils() { binutils_opts= # If GMP and MPFR were configured, then use that, # otherwise let binutils find the system-wide libraries, if they exist. - if [ "${CT_CC_GCC_GMP_MPFR}" = "y" ]; then + if [ "${CT_GMP_MPFR}" = "y" ]; then binutils_opts="--with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" fi diff --git a/scripts/build/cc_gcc.sh b/scripts/build/cc_gcc.sh index a21c20f..f57b9e3 100644 --- a/scripts/build/cc_gcc.sh +++ b/scripts/build/cc_gcc.sh @@ -59,7 +59,7 @@ do_cc_core_static() { CT_DoLog EXTRA "Configuring static core C compiler" extra_config="${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}" - [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" + [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then extra_config="${extra_config} --enable-__cxa_atexit" else @@ -118,7 +118,7 @@ do_cc_core_shared() { CT_DoLog EXTRA "Configuring shared core C compiler" extra_config="${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}" - [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" + [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then extra_config="${extra_config} --enable-__cxa_atexit" else @@ -224,7 +224,7 @@ do_cc() { extra_config="${extra_config} --disable-multilib" extra_config="${extra_config} ${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}" [ "${CT_SHARED_LIBS}" = "y" ] || extra_config="${extra_config} --disable-shared" - [ "${CT_CC_GCC_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" + [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" [ -n "${CT_CC_PKGVERSION}" ] && extra_config="${extra_config} --with-pkgversion=${CT_CC_PKGVERSION}" [ -n "${CT_CC_BUGURL}" ] && extra_config="${extra_config} --with-bugurl=${CT_CC_BUGURL}" if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index a2f5e7c..791e68c 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -52,7 +52,7 @@ do_debug_gdb_build() { cd "${CT_BUILD_DIR}/build-gdb-cross" cross_extra_config="${extra_config}" - if [ "${CT_CC_GCC_GMP_MPFR}" = "y" ]; then + if [ "${CT_GMP_MPFR}" = "y" ]; then cross_extra_config="${cross_extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" fi case "${CT_THREADS}" in |