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>

6 files changed, 6 insertions, 6 deletions

diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh
index 5c2b421..f83aa24 100644
--- a/scripts/build/companion_libs/cloog.sh
+++ b/scripts/build/companion_libs/cloog.sh
@@ -64,7 +64,7 @@ do_cloog_for_host() {
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-cloog-ppl-host-${CT_HOST}"
 
     cloog_opts+=( "host=${CT_HOST}" )
-    cloog_opts+=( "prefix=${CT_COMPLIBS_DIR}" )
+    cloog_opts+=( "prefix=${CT_HOST_COMPLIBS_DIR}" )
     cloog_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
     do_cloog_backend "${cloog_opts[@]}"
 
diff --git a/scripts/build/companion_libs/gmp.sh b/scripts/build/companion_libs/gmp.sh
index 04af002..ebc095b 100644
--- a/scripts/build/companion_libs/gmp.sh
+++ b/scripts/build/companion_libs/gmp.sh
@@ -51,7 +51,7 @@ do_gmp_for_host() {
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-gmp-host-${CT_HOST}"
 
     gmp_opts+=( "host=${CT_HOST}" )
-    gmp_opts+=( "prefix=${CT_COMPLIBS_DIR}" )
+    gmp_opts+=( "prefix=${CT_HOST_COMPLIBS_DIR}" )
     gmp_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
     do_gmp_backend "${gmp_opts[@]}"
 
diff --git a/scripts/build/companion_libs/libelf.sh b/scripts/build/companion_libs/libelf.sh
index c10a7bf..e7b140b 100644
--- a/scripts/build/companion_libs/libelf.sh
+++ b/scripts/build/companion_libs/libelf.sh
@@ -52,7 +52,7 @@ do_libelf_for_host() {
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-libelf-host-${CT_HOST}"
 
     libelf_opts+=( "host=${CT_HOST}" )
-    libelf_opts+=( "prefix=${CT_COMPLIBS_DIR}" )
+    libelf_opts+=( "prefix=${CT_HOST_COMPLIBS_DIR}" )
     libelf_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
     do_libelf_backend "${libelf_opts[@]}"
 
diff --git a/scripts/build/companion_libs/mpc.sh b/scripts/build/companion_libs/mpc.sh
index f45982d..b035f4d 100644
--- a/scripts/build/companion_libs/mpc.sh
+++ b/scripts/build/companion_libs/mpc.sh
@@ -52,7 +52,7 @@ do_mpc_for_host() {
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-mpc-host-${CT_HOST}"
 
     mpc_opts+=( "host=${CT_HOST}" )
-    mpc_opts+=( "prefix=${CT_COMPLIBS_DIR}" )
+    mpc_opts+=( "prefix=${CT_HOST_COMPLIBS_DIR}" )
     mpc_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
     do_mpc_backend "${mpc_opts[@]}"
 
diff --git a/scripts/build/companion_libs/mpfr.sh b/scripts/build/companion_libs/mpfr.sh
index b346757..35a4849 100644
--- a/scripts/build/companion_libs/mpfr.sh
+++ b/scripts/build/companion_libs/mpfr.sh
@@ -94,7 +94,7 @@ do_mpfr_for_host() {
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-mpfr-host-${CT_HOST}"
 
     mpfr_opts+=( "host=${CT_HOST}" )
-    mpfr_opts+=( "prefix=${CT_COMPLIBS_DIR}" )
+    mpfr_opts+=( "prefix=${CT_HOST_COMPLIBS_DIR}" )
     mpfr_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
     do_mpfr_backend "${mpfr_opts[@]}"
 
diff --git a/scripts/build/companion_libs/ppl.sh b/scripts/build/companion_libs/ppl.sh
index da7fb1a..90dcad3 100644
--- a/scripts/build/companion_libs/ppl.sh
+++ b/scripts/build/companion_libs/ppl.sh
@@ -54,7 +54,7 @@ do_ppl_for_host() {
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-ppl-host-${CT_HOST}"
 
     ppl_opts+=( "host=${CT_HOST}" )
-    ppl_opts+=( "prefix=${CT_COMPLIBS_DIR}" )
+    ppl_opts+=( "prefix=${CT_HOST_COMPLIBS_DIR}" )
     ppl_opts+=( "cflags=${CT_CFLAGS_FOR_HOST}" )
     do_ppl_backend "${ppl_opts[@]}"