summaryrefslogtreecommitdiff
path: root/scripts/build/cc/gcc.sh
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-07-25 17:04:17 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-07-25 17:04:17 (GMT)
commit2f718dd60c19a5d671e7fbef00c67c05ef98c9f4 (patch)
tree7a4940f84ef5838b66b5290a14bc7f95296fdedc /scripts/build/cc/gcc.sh
parent4a8daa02e39e234aa03833287fcec3401d9932a4 (diff)
complibs: fixup the host complibs install dir
It's easier to have as much as possible stuff in the same place to ease backup/restore, and make things easier to follow. Move the host companion libraries install dir as a sub-dir of the build-tools install dir (but not directly in it, it would break for canadian or cross-native). Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'scripts/build/cc/gcc.sh')
-rw-r--r--scripts/build/cc/gcc.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index d1bb274..b56b49c 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -68,7 +68,7 @@ do_cc_core_pass_1() {
do_core=y
core_opts+=( "mode=static" )
core_opts+=( "host=${CT_BUILD}" )
- core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
+ core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
core_opts+=( "prefix=${CT_BUILDTOOLS_PREFIX_DIR}" )
core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
;;
@@ -93,7 +93,7 @@ do_cc_core_pass_2() {
# Common options:
core_opts+=( "host=${CT_BUILD}" )
core_opts+=( "prefix=${CT_BUILDTOOLS_PREFIX_DIR}" )
- core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
+ core_opts+=( "complibs=${CT_BUILDTOOLS_PREFIX_DIR}" )
core_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
# Do nothing for canadian-crosses, we already have a target compiler.
@@ -469,7 +469,7 @@ do_cc() {
final_opts+=( "host=${CT_HOST}" )
final_opts+=( "prefix=${CT_PREFIX_DIR}" )
- final_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
+ final_opts+=( "complibs=${CT_HOST_COMPLIBS_DIR}" )
final_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
if [ "${CT_BUILD_MANUALS}" = "y" ]; then
final_opts+=( "build_manuals=yes" )