diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-02-16 04:37:21 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-02-16 04:37:21 (GMT) |
| commit | 2d1b469f888858180ee95d43a0b89981b38cf93e (patch) | |
| tree | fd92dbfbb73f9fdf4e07468e6c0888d77f0af87e /scripts/build/companion_libs/320-libiconv.sh | |
| parent | 2f052394a5376fe90c240972e2cb8f8abcc7267c (diff) | |
| parent | 07e03aed8c43ea4c295575bd91f2774b25be8d19 (diff) | |
Merge pull request #599 from stilor/avoid-gettext-for-linux-host
Skip gettext/libiconv on linux-gnu
Diffstat (limited to 'scripts/build/companion_libs/320-libiconv.sh')
| -rw-r--r-- | scripts/build/companion_libs/320-libiconv.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh index 3e7df3d..f2f0bef 100644 --- a/scripts/build/companion_libs/320-libiconv.sh +++ b/scripts/build/companion_libs/320-libiconv.sh @@ -76,12 +76,19 @@ do_libiconv_backend() { eval "${arg// /\\ }" done - CT_DoLog EXTRA "Configuring libiconv" + case "${host}" in + *-linux-gnu*) + CT_DoLog EXTRA "Skipping (included in GNU C library)" + return + ;; + esac if [ "${shared}" != "y" ]; then extra_config+=("--disable-shared") fi + CT_DoLog EXTRA "Configuring libiconv" + CT_DoExecLog CFG \ CFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ |