diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/build/companion_libs/gmp.sh | 12 | ||||
-rw-r--r-- | scripts/build/companion_libs/mpfr.sh | 12 | ||||
-rw-r--r-- | scripts/build/debug/300-gdb.sh | 3 |
3 files changed, 18 insertions, 9 deletions
diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh index 351c2fa..2c27693 100644 --- a/scripts/build/companion_libs/gmp.sh +++ b/scripts/build/companion_libs/gmp.sh @@ -8,7 +8,7 @@ do_gmp() { :; } 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 @@ do_gmp_extract() { CT_Patch "gmp-${CT_GMP_VERSION}" } +if [ "${CT_GMP}" = "y" ]; then + do_gmp() { mkdir -p "${CT_BUILD_DIR}/build-gmp" @@ -56,7 +58,9 @@ do_gmp() { 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 @@ do_gmp_target() { CT_EndStep } -fi # CT_COMPLIBS_TARGET == y +fi # CT_GMP_TARGET -fi # CT_GMP == y +fi # CT_GMP || CT_GMP_TARGET diff --git a/scripts/build/companion_libs/mpfr.sh b/scripts/build/companion_libs/mpfr.sh index 5e91e1a..12fe125 100644 --- a/scripts/build/companion_libs/mpfr.sh +++ b/scripts/build/companion_libs/mpfr.sh @@ -8,7 +8,7 @@ do_mpfr() { :; } 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 @@ do_mpfr_extract() { 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 @@ do_mpfr() { 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 @@ do_mpfr_target() { CT_EndStep } -fi # CT_COMPLIBS_TARGET == y +fi # CT_MPFR_TARGET -fi # CT_MPFR == y +fi # CT_MPFR || CT_MPFR_TARGET diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 4b90091..1d065c8 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -224,7 +224,8 @@ do_debug_gdb_build() { *) 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 |