diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-02-17 23:50:49 +0100 |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-02-17 23:50:49 +0100 |
commit | 2949150cbe92e9e90e9738a2b77489cb0593b5a7 (patch) | |
tree | cd4a7a01a59c6a0e5960ca9314142ef1fbf7cb8d /scripts/build/companion_libs | |
parent | 77a605d48ed255d94bbe93ba17d53a2245a22a35 (diff) | |
download | crosstool-ng-2949150cbe92e9e90e9738a2b77489cb0593b5a7.tar.gz crosstool-ng-2949150cbe92e9e90e9738a2b77489cb0593b5a7.tar.bz2 crosstool-ng-2949150cbe92e9e90e9738a2b77489cb0593b5a7.zip |
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.
Diffstat (limited to 'scripts/build/companion_libs')
-rw-r--r-- | scripts/build/companion_libs/gmp.sh | 12 | ||||
-rw-r--r-- | scripts/build/companion_libs/mpfr.sh | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh index 351c2fa1..2c27693c 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 5e91e1ad..12fe125e 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 |