From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22451 invoked by alias); 26 Mar 2002 22:36:35 -0000 Mailing-List: contact gdb-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sources.redhat.com Received: (qmail 22255 invoked from network); 26 Mar 2002 22:36:30 -0000 Received: from unknown (HELO rwcrmhc54.attbi.com) (216.148.227.87) by sources.redhat.com with SMTP; 26 Mar 2002 22:36:30 -0000 Received: from ocean.lucon.org ([12.234.143.38]) by rwcrmhc54.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020326223627.MKRD1214.rwcrmhc54.attbi.com@ocean.lucon.org>; Tue, 26 Mar 2002 22:36:27 +0000 Received: by ocean.lucon.org (Postfix, from userid 1000) id D5FCA125C1; Tue, 26 Mar 2002 14:36:26 -0800 (PST) Date: Tue, 26 Mar 2002 14:36:00 -0000 From: "H . J . Lu" To: DJ Delorie Cc: gdb@sources.redhat.com, gcc@gcc.gnu.org Subject: Re: The canadian cross build is broken Message-ID: <20020326143626.A9750@lucon.org> References: <20020322225214.A23883@lucon.org> <3C9C9F3A.6030609@cygnus.com> <20020323101441.A799@lucon.org> <200203252214.g2PMEqj02765@greed.delorie.com> <20020326132429.A8347@lucon.org> <200203262149.g2QLnIK14130@greed.delorie.com> <20020326135334.A8928@lucon.org> <200203262200.g2QM0Rc14288@greed.delorie.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200203262200.g2QM0Rc14288@greed.delorie.com>; from dj@redhat.com on Tue, Mar 26, 2002 at 05:00:27PM -0500 X-SW-Source: 2002-03/txt/msg00252.txt.bz2 On Tue, Mar 26, 2002 at 05:00:27PM -0500, DJ Delorie wrote: > > > Why? Here is the fragment. $frag won't be empty. The default one is > > mh-${host_cpu}pic: > > In some future cases, it may end up getting added twice, in other > cases, it's empty and may cause problems. For example, for cygwin > frag remains set to its previous value (currently empty) so you end up > adding "config/" to the list of frags. A new patch. I put back +with_build_subdir=${with_build_subdir} into configure.in. Otherwise, ${libiberty_topdir}/config-ml.in won't be called. H.J. --- 2002-03-26 H.J. Lu (hjl@gnu.org) * config.table: Support --with-build-subdir. * configure.in: Likewise. * configure: Rebuild. --- binutils-2.12.90.0.3/libiberty/config.table.build Fri Nov 16 14:05:55 2001 +++ binutils-2.12.90.0.3/libiberty/config.table Tue Mar 26 14:02:46 2002 @@ -1,3 +1,9 @@ +# Don't build the shared library for build. +if [ -n "${with_build_subdir}" ]; then + enable_shared=no +fi + +frag= case "${host}" in rs6000-ibm-aix3.1 | rs6000-ibm-aix) frag=mh-aix ;; @@ -8,7 +14,11 @@ case "${host}" in i[345]86-*-windows*) frag=mh-windows ;; esac -frags=$frag +if [ -n "${frag}" ]; then + frags=${libiberty_topdir}/libiberty/config/$frag +else + frags= +fi # If they didn't specify --enable-shared, don't generate shared libs. case "${enable_shared}" in @@ -18,32 +28,27 @@ case "${enable_shared}" in *) shared=yes ;; esac if [ "${shared}" = "yes" ]; then + frag= case "${host}" in *-*-cygwin*) ;; - alpha*-*-linux*) frags="${frags} ../../config/mh-elfalphapic" ;; - arm*-*-*) frags="${frags} ../../config/mh-armpic" ;; - hppa*-*-*) frags="${frags} ../../config/mh-papic" ;; - i[3456]86-*-*) frags="${frags} ../../config/mh-x86pic" ;; - mips*-*-linux*) frags="${frags} ../../config/mh-mipspic" ;; + alpha*-*-linux*) frag=mh-elfalphapic ;; + arm*-*-*) frag=mh-armpic ;; + hppa*-*-*) frag=mh-papic ;; + i[3456]86-*-*) frag=mh-x86pic ;; + mips*-*-linux*) frag=mh-mipspic ;; powerpc*-*-aix*) ;; - powerpc*-*-*) frags="${frags} ../../config/mh-ppcpic" ;; - sparc*-*-*) frags="${frags} ../../config/mh-sparcpic" ;; - *-*-*) frags="${frags} ../../config/mh-${host_cpu}pic" ;; + powerpc*-*-*) frag=mh-ppcpic ;; + sparc*-*-*) frag=mh-sparcpic ;; + *) frag=mh-${host_cpu}pic ;; esac + if [ -n "${frag}" ]; then + frags="${frags} ${libiberty_topdir}/config/${frag}" + fi fi echo "# Warning: this fragment is automatically generated" > temp-frag for frag in ${frags}; do - case ${frag} in - ../* ) - if [ ${srcdir} = . ]; then - [ -n "${with_target_subdir}" ] && frag=../${frag} - [ -n "${with_multisrctop}" ] && frag=${with_multisrctop}${frag} - fi - ;; - esac - frag=${srcdir}/${xsrcdir}config/$frag if [ -f ${frag} ]; then echo "Appending ${frag} to xhost-mkfrag" echo "# Following fragment copied from ${frag}" >> temp-frag --- binutils-2.12.90.0.3/libiberty/configure.in.build Thu Mar 7 11:52:40 2002 +++ binutils-2.12.90.0.3/libiberty/configure.in Tue Mar 26 14:32:11 2002 @@ -5,14 +5,19 @@ AC_INIT(pexecute.c) dnl We use these options to decide which functions to include. AC_ARG_WITH(target-subdir, -[ --with-target-subdir=SUBDIR Configuring in a subdirectory]) +[ --with-target-subdir=SUBDIR Configuring in a subdirectory for target]) +AC_ARG_WITH(build-subdir, +[ --with-build-subdir=SUBDIR Configuring in a subdirectory for build]) AC_ARG_WITH(cross-host, [ --with-cross-host=HOST Configuring with a cross compiler]) AC_ARG_WITH(newlib, [ --with-newlib Configuring with newlib]) if test "${srcdir}" = "."; then - if test -z "${with_target_subdir}"; then + if test -n "${with_build_subdir}"; then + libiberty_topdir="${srcdir}/../.." + with_target_subdir= + elif test -z "${with_target_subdir}"; then libiberty_topdir="${srcdir}/.." else if test "${with_target_subdir}" != "."; then @@ -429,7 +434,7 @@ AC_SUBST(INSTALL_DEST) AC_OUTPUT(Makefile testsuite/Makefile, [test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h if test -n "$CONFIG_FILES"; then - if test -n "${with_target_subdir}"; then + if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then # FIXME: We shouldn't need to set ac_file ac_file=Makefile . ${libiberty_topdir}/config-ml.in @@ -439,6 +444,7 @@ srcdir=${srcdir} host=${host} target=${target} with_target_subdir=${with_target_subdir} +with_build_subdir=${with_build_subdir} with_multisubdir=${with_multisubdir} ac_configure_args="--enable-multilib ${ac_configure_args}" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}