[nls PATCH 3 of 3] cc/gcc: Handle --disable-nls config

[Zhenqiang Chen]

# HG changeset patch
# User Zhenqiang Chen <zhenqiang.chen@linaro.org>
# Date 1321524028 -28800
# Node ID e53dbc5ca50291b5258e19d1738fdf34e3a460ad
# Parent  640bdfd7d1efc1b91ad54304fefe6db77179ec65
cc/gcc: Add --disable-nls config when option "Enable nls" is not selected.

Reviewed-by: Michael Hope
Signed-off-by: Zhenqiang Chen <zhenqiang.chen@linaro.org>

diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -289,6 +289,8 @@
      extra_config+=(--disable-libgomp)
      extra_config+=(--disable-libmudflap)

+    [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls")
+
      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"

      # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
@@ -306,7 +308,6 @@
          --disable-libmudflap                        \
          ${CC_CORE_SYSROOT_ARG}                      \
          "${extra_config[@]}"                        \
-        --disable-nls                               \
          --enable-languages="${lang_opt}"            \
          "${CT_CC_CORE_EXTRA_CONFIG_ARRAY[@]}"

@@ -598,10 +599,10 @@
              ;; # ARCH is mips
      esac

+    [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls")
+
      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"

-    # --disable-nls to work around crash bug on ppc405, but also because
-    # embedded systems don't really need message catalogs...
      CT_DoExecLog CFG                                \
      CC_FOR_BUILD="${CT_BUILD}-gcc"                  \
      CFLAGS="${CT_CFLAGS_FOR_HOST}"                  \
@@ -617,7 +618,6 @@
          ${CC_SYSROOT_ARG}                           \
          "${extra_config[@]}"                        \
          --with-local-prefix="${CT_SYSROOT_DIR}"     \
-        --disable-nls                               \
          --enable-c99                                \
          --enable-long-long                          \
          "${CT_CC_EXTRA_CONFIG_ARRAY[@]}"

--
For unsubscribe information see http://sourceware.org/lists.html#faq