Change when libiconv/gettext are built.

Make them configurable, default to y when build!=host (i.e. canadian or cross-native) because we don't know what libraries the host will provide. GLIBC, as previously, selects them explicitly. Signed-off-by: Alexey Neyman <stilor@att.net>
crosstool-ng · Jan 10, 2017 · 8e7ac5f · 8e7ac5f
1 parent ca07000
commit 8e7ac5f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/config/companion_libs.in b/config/companion_libs.in
@@ -62,11 +62,13 @@ config COMPLIBS
     bool
 
 config LIBICONV
-    bool
+    bool "Build local libiconv"
+    default y if CANADIAN || CROSS_NATIVE
     select COMPLIBS
 
 config GETTEXT
-    bool
+    bool "Build local gettext"
+    default y if CANADIAN || CROSS_NATIVE
     select COMPLIBS
 
 config GMP

diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh
@@ -22,10 +22,8 @@ do_libiconv_extract() {
 do_libiconv_for_build() {
     local -a libiconv_opts
 
-    case "$CT_BUILD" in
-        *darwin*|*linux*)
-            return 0
-            ;;
+    case "${CT_TOOLCHAIN_TYPE}" in
+        native|cross)   return 0;;
     esac
 
     CT_DoStep INFO "Installing libiconv for build"

diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh
@@ -22,10 +22,8 @@ do_gettext_extract() {
 do_gettext_for_build() {
     local -a gettext_opts
 
-    case "$CT_BUILD" in
-        *linux*)
-            return 0
-            ;;
+    case "${CT_TOOLCHAIN_TYPE}" in
+        native|cross)   return 0;;
     esac
 
     CT_DoStep INFO "Installing gettext for build"