From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1053 invoked by alias); 22 Nov 2011 11:57:13 -0000 Received: (qmail 1044 invoked by uid 22791); 22 Nov 2011 11:57:12 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-gy0-f169.google.com (HELO mail-gy0-f169.google.com) (209.85.160.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 22 Nov 2011 11:56:40 +0000 Received: by ghrr17 with SMTP id r17so96361ghr.0 for ; Tue, 22 Nov 2011 03:56:40 -0800 (PST) Received: by 10.50.94.229 with SMTP id df5mr20091188igb.27.1321963000016; Tue, 22 Nov 2011 03:56:40 -0800 (PST) Received: from [192.168.0.100] ([122.84.23.42]) by mx.google.com with ESMTPS id p16sm59133791ibk.6.2011.11.22.03.56.36 (version=SSLv3 cipher=OTHER); Tue, 22 Nov 2011 03:56:39 -0800 (PST) Message-ID: <4ECB8DEF.8000108@linaro.org> Date: Tue, 22 Nov 2011 11:57:00 -0000 From: Zhenqiang Chen User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:8.0) Gecko/20111105 Thunderbird/8.0 MIME-Version: 1.0 To: yann.morin.1998@anciens.enib.fr CC: crossgcc@sourceware.org Subject: [nls PATCH 3 of 3] cc/gcc: Handle --disable-nls config Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org X-SW-Source: 2011-11/txt/msg00121.txt.bz2 # HG changeset patch # User Zhenqiang Chen # 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 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