From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19216 invoked by alias); 7 Jan 2013 19:32:45 -0000 Received: (qmail 19207 invoked by uid 22791); 7 Jan 2013 19:32:44 -0000 X-SWARE-Spam-Status: No, hits=-3.8 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,KHOP_RCVD_TRUST,KHOP_THREADED,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-qc0-f169.google.com (HELO mail-qc0-f169.google.com) (209.85.216.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 07 Jan 2013 19:32:38 +0000 Received: by mail-qc0-f169.google.com with SMTP id t2so13172255qcq.28 for ; Mon, 07 Jan 2013 11:32:37 -0800 (PST) MIME-Version: 1.0 Received: by 10.224.18.136 with SMTP id w8mr44942024qaa.2.1357587157545; Mon, 07 Jan 2013 11:32:37 -0800 (PST) Received: by 10.49.12.210 with HTTP; Mon, 7 Jan 2013 11:32:37 -0800 (PST) In-Reply-To: References: <20121130150235.GA7366@intel.com> Date: Mon, 07 Jan 2013 19:32:00 -0000 Message-ID: Subject: Re: PATCH: PR gold/14897: gold is installed as default ld by accident From: "H.J. Lu" To: Ian Lance Taylor Cc: binutils@sourceware.org Content-Type: text/plain; charset=ISO-8859-1 X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2013-01/txt/msg00079.txt.bz2 On Mon, Jan 7, 2013 at 10:41 AM, Ian Lance Taylor wrote: > > I think it would be easier to understand if you wrote it more like this: > > AC_ARG_ENABLE(ld, [[ --enable-ld[=ARG] build ld [ARG={default,yes,no}]]]) > > installed_linker=ld.gold > AC_ARG_ENABLE(gold, > [[ --enable-gold[=ARG] build gold [ARG={default,yes,no}]]], > [case "${enableval}" in > default) > install_as_default=yes > ;; > yes) > if test x${enable_ld} = xno; then > install_as_default=yes > fi > ;; > esac]) > > I think the logic here is clearer: we set install_as_default when we > see --enable-gold=default, or when we see --enable-gold --disable-ld. > There is no need for AC_ARG_ENABLE(ld, [[ --enable-ld[=ARG] build ld [ARG={default,yes,no}]]]) since we only check if test x${enable_ld} = xno; then enable_ld is set to no for --disable-ld by default. Here is the updated patch. OK for trunk? Thanks. -- H.J. --- 2013-01-07 H.J. Lu Ian Lance Taylor PR gold/14897 * configure.ac (--enable-ld): Removed. (install_as_default): Set to yes only for --enable-gold=default or --disable-ld. * configure: Regenerated. diff --git a/gold/configure.ac b/gold/configure.ac index e49d6e8..804a474 100644 --- a/gold/configure.ac +++ b/gold/configure.ac @@ -68,32 +68,20 @@ dnl "install_as_default" is true if the linker to be install ed as the dnl default linker, ld. dnl "installed_linker" is the installed gold linker name. -default_ld= -AC_ARG_ENABLE(ld, -[[ --enable-ld[=ARG] build ld [ARG={default,yes,no}]]], -[case "${enableval}" in - default) - default_ld=ld.bfd - ;; -esac]) - +installed_linker=ld.gold AC_ARG_ENABLE(gold, [[ --enable-gold[=ARG] build gold [ARG={default,yes,no}]]], [case "${enableval}" in - yes|default) - if test x${default_ld} = x; then + default) + install_as_default=yes + ;; + yes) + if test x${enable_ld} = xno; then install_as_default=yes fi - installed_linker=ld.gold - ;; - no) - ;; - *) - AC_MSG_ERROR([invalid --enable-gold argument]) ;; esac], -[install_as_default=no - installed_linker=ld.gold]) +[install_as_default=no]) AC_SUBST(install_as_default) AC_SUBST(installed_linker)