From 6f7e6b9969681cb3f85464066fa819fa90060783 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Thu, 5 Nov 2015 15:49:19 -0800
Subject: Build companion libs for target.

Currently, only libelf has a for-target step - but it generalizes
the step to hook other libraries into this step.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/build/companion_libs.sh b/scripts/build/companion_libs.sh
index dc223de..8ef830d 100644
--- a/scripts/build/companion_libs.sh
+++ b/scripts/build/companion_libs.sh
@@ -37,3 +37,10 @@ do_companion_libs_for_host() {
     done
 }
 
+# Build the companion libs facilities for target
+do_companion_libs_for_target() {
+    for f in ${CT_COMP_LIBS_FACILITY_LIST}; do
+        do_${f}_for_target
+    done
+}
+
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index f0c96a2..f0df3d1 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/scripts/build/companion_libs/100-gmp.sh
@@ -6,6 +6,7 @@ do_gmp_get() { :; }
 do_gmp_extract() { :; }
 do_gmp_for_build() { :; }
 do_gmp_for_host() { :; }
+do_gmp_for_target() { :; }
 
 # Overide functions depending on configuration
 if [ "${CT_GMP}" = "y" ]; then
diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh
index bef2283..bcbe90f 100644
--- a/scripts/build/companion_libs/110-mpfr.sh
+++ b/scripts/build/companion_libs/110-mpfr.sh
@@ -6,6 +6,7 @@ do_mpfr_get() { :; }
 do_mpfr_extract() { :; }
 do_mpfr_for_build() { :; }
 do_mpfr_for_host() { :; }
+do_mpfr_for_target() { :; }
 
 # Overide function depending on configuration
 if [ "${CT_MPFR}" = "y" ]; then
diff --git a/scripts/build/companion_libs/120-ppl.sh b/scripts/build/companion_libs/120-ppl.sh
index c95ea56..cf4f99f 100644
--- a/scripts/build/companion_libs/120-ppl.sh
+++ b/scripts/build/companion_libs/120-ppl.sh
@@ -6,6 +6,7 @@ do_ppl_get() { :; }
 do_ppl_extract() { :; }
 do_ppl_for_build() { :; }
 do_ppl_for_host() { :; }
+do_ppl_for_target() { :; }
 
 # Overide functions depending on configuration
 if [ "${CT_PPL}" = "y" ]; then
diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh
index 5a623e1..823dbd5 100644
--- a/scripts/build/companion_libs/121-isl.sh
+++ b/scripts/build/companion_libs/121-isl.sh
@@ -6,6 +6,7 @@ do_isl_get() { :; }
 do_isl_extract() { :; }
 do_isl_for_build() { :; }
 do_isl_for_host() { :; }
+do_isl_for_target() { :; }
 
 # Overide functions depending on configuration
 if [ "${CT_ISL}" = "y" ]; then
diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh
index fe5ba13..f7b5798 100644
--- a/scripts/build/companion_libs/130-cloog.sh
+++ b/scripts/build/companion_libs/130-cloog.sh
@@ -6,6 +6,10 @@ do_cloog_get() { :; }
 do_cloog_extract() { :; }
 do_cloog_for_build() { :; }
 do_cloog_for_host() { :; }
+do_cloog_for_target() { :; }
+
+# Overide functions depending on configuration
+if [ "${CT_CLOOG}" = "y" ]; then
 
 cloog_basename() {
     printf "cloog"
@@ -18,9 +22,6 @@ cloog_basename_version() {
     printf -- "-${CT_CLOOG_VERSION}"
 }
 
-# Overide functions depending on configuration
-if [ "${CT_CLOOG}" = "y" ]; then
-
 # Download CLooG
 do_cloog_get() {
     CT_GetFile "$(cloog_basename_version)"          \
diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh
index b15eea6..f68e18e 100644
--- a/scripts/build/companion_libs/140-mpc.sh
+++ b/scripts/build/companion_libs/140-mpc.sh
@@ -6,6 +6,7 @@ do_mpc_get() { :; }
 do_mpc_extract() { :; }
 do_mpc_for_build() { :; }
 do_mpc_for_host() { :; }
+do_mpc_for_target() { :; }
 
 # Overide functions depending on configuration
 if [ "${CT_MPC}" = "y" ]; then
diff --git a/steps.mk b/steps.mk
index 6a6e07e..b7e3b02 100644
--- a/steps.mk
+++ b/steps.mk
@@ -18,24 +18,24 @@ help-env::
 # but are actual steps for canadian and cross-native.
 # Please keep the last line with a '\' and keep the following empy line:
 # it helps when diffing and merging.
-CT_STEPS := libc_check_config        \
-            companion_libs_for_build \
-            binutils_for_build       \
-            companion_libs_for_host  \
-            binutils_for_host        \
-            cc_core_pass_1           \
-            kernel_headers           \
-            libc_start_files         \
-            cc_core_pass_2           \
-            libc                     \
-            cc_for_build             \
-            cc_for_host              \
-            libc_post_cc             \
-            libelf_for_target        \
-            binutils_for_target      \
-            debug                    \
-            test_suite               \
-            finish                   \
+CT_STEPS := libc_check_config          \
+            companion_libs_for_build   \
+            binutils_for_build         \
+            companion_libs_for_host    \
+            binutils_for_host          \
+            cc_core_pass_1             \
+            kernel_headers             \
+            libc_start_files           \
+            cc_core_pass_2             \
+            libc                       \
+            cc_for_build               \
+            cc_for_host                \
+            libc_post_cc               \
+            companion_libs_for_target  \
+            binutils_for_target        \
+            debug                      \
+            test_suite                 \
+            finish                     \
 
 # Keep an empty line above this comment, so the last
 # back-slash terminated line works as expected.
-- 
cgit v0.10.2-6-g49f6