From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1652 invoked by alias); 4 Jul 2002 01:16:03 -0000 Mailing-List: contact binutils-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sources.redhat.com Received: (qmail 1611 invoked from network); 4 Jul 2002 01:15:51 -0000 Received: from unknown (HELO nerodeguest) (24.161.107.98) by sources.redhat.com with SMTP; 4 Jul 2002 01:15:51 -0000 Received: from neroden by nerodeguest with local (Exim 3.35 #1 (Debian)) id 17PvC8-00016o-00; Wed, 03 Jul 2002 21:14:04 -0400 Date: Wed, 03 Jul 2002 18:22:00 -0000 To: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com, binutils@sources.redhat.com, dj@redhat.com Subject: [patch] more toplevel configure.in tweaks Message-ID: <20020704011404.GA4259@doctormoo.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.3.28i From: Nathanael Nerode X-SW-Source: 2002-07/txt/msg00084.txt.bz2 This works around a bug that doesn't exist yet. *cough* OK, what I mean to say is that there is a bug in autoconf 2.13's version of AC_SUBST_FILE; unlike the version in 2.5x, it doesn't check for its file in srcdir, so the reference thereto must be explicit in the filename. The changed 'frag' lines are going to be substituted using AC_SUBST_FILE when I autoconfiscate. Accordingly, I relocated the specification of ${srcdir} to each file name. This patch is primarily to reduce the size of the final diff when I autoconfiscate; to keep as much of these trivial changes out. 2002-07-03 Nathanael Nerode * configure.in: Specify ${srcdir} explicitly in makefrag names. Index: configure.in =================================================================== RCS file: /cvs/gcc/gcc/configure.in,v retrieving revision 1.168 diff -u -r1.168 configure.in --- configure.in 3 Jul 2002 22:50:35 -0000 1.168 +++ configure.in 4 Jul 2002 01:09:46 -0000 @@ -980,11 +980,11 @@ m68k-hp-hpux*) # Avoid "too much defining" errors from HPUX compiler. tentative_cc="cc -Wp,-H256000" - host_makefile_frag="config/mh-hp300" + host_makefile_frag="${srcdir}/config/mh-hp300" ;; m68k-apollo-sysv*) tentative_cc="cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DUSG" - host_makefile_frag="config/mh-apollo68" + host_makefile_frag="${srcdir}/config/mh-apollo68" ;; m68k-apollo-bsd*) #None of the Apollo compilers can compile gas or binutils. The preprocessor @@ -994,34 +994,34 @@ # or whatever), but I'm not sure leaving CC as cc is any better... #CC=cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_STDARG tentative_cc=gcc - host_makefile_frag="config/mh-a68bsd" + host_makefile_frag="${srcdir}/config/mh-a68bsd" ;; m88k-dg-dgux*) tentative_cc="gcc -Wall -ansi -D__using_DGUX" - host_makefile_frag="config/mh-dgux" + host_makefile_frag="${srcdir}/config/mh-dgux" ;; m88k-harris-cxux*) # Under CX/UX, we want to tell the compiler to use ANSI mode. tentative_cc="cc -Xa" - host_makefile_frag="config/mh-cxux" + host_makefile_frag="${srcdir}/config/mh-cxux" ;; m88k-motorola-sysv*) - host_makefile_frag="config/mh-delta88" + host_makefile_frag="${srcdir}/config/mh-delta88" ;; mips*-dec-ultrix*) tentative_cc="cc -Wf,-XNg1000" - host_makefile_frag="config/mh-decstation" + host_makefile_frag="${srcdir}/config/mh-decstation" ;; mips*-nec-sysv4*) # The C compiler on NEC MIPS SVR4 needs bigger tables. tentative_cc="cc -ZXNd=5000 -ZXNg=1000" - host_makefile_frag="config/mh-necv4" + host_makefile_frag="${srcdir}/config/mh-necv4" ;; mips*-sgi-irix6*) - host_makefile_frag="config/mh-irix6" + host_makefile_frag="${srcdir}/config/mh-irix6" ;; mips*-sgi-irix5*) - host_makefile_frag="config/mh-irix5" + host_makefile_frag="${srcdir}/config/mh-irix5" ;; mips*-sgi-irix4*) # Tell compiler to use K&R C. We can't compile under the SGI Ansi @@ -1030,10 +1030,10 @@ tentative_cc="cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000 -Wf,-XNl8192" ;; mips*-sgi-irix3*) - host_makefile_frag="config/mh-sysv" + host_makefile_frag="${srcdir}/config/mh-sysv" ;; mips*-*-sysv4*) - host_makefile_frag="config/mh-sysv4" + host_makefile_frag="${srcdir}/config/mh-sysv4" ;; mips*-*-sysv*) # This is for a MIPS running RISC/os 4.52C. @@ -1049,24 +1049,24 @@ # This is not part of CFLAGS because perhaps not all C compilers have this # option. tentative_cc="cc -systype sysv" - host_makefile_frag="config/mh-riscos" + host_makefile_frag="${srcdir}/config/mh-riscos" ;; i370-ibm-opened*) tentative_cc="c89" - host_makefile_frag="config/mh-openedition" + host_makefile_frag="${srcdir}/config/mh-openedition" ;; i[3456]86-*-sysv5*) - host_makefile_frag="config/mh-sysv5" + host_makefile_frag="${srcdir}/config/mh-sysv5" ;; i[3456]86-*-dgux*) tentative_cc="gcc -Wall -ansi -D__using_DGUX" - host_makefile_frag="config/mh-dgux386" + host_makefile_frag="${srcdir}/config/mh-dgux386" ;; i[3456]86-ncr-sysv4.3*) # The MetaWare compiler will generate a copyright message unless you # turn it off by adding the -Hnocopyr flag. tentative_cc="cc -Hnocopyr" - host_makefile_frag="config/mh-ncrsvr43" + host_makefile_frag="${srcdir}/config/mh-ncrsvr43" ;; i[3456]86-ncr-sysv4*) # for an NCR 3000 (i486/SVR4) system. @@ -1075,47 +1075,47 @@ # you run it, but it chokes and dies on a whole bunch of GNU source # files. Default to using the AT&T compiler installed in /usr/ccs/ATT/cc. tentative_cc="/usr/ccs/ATT/cc" - host_makefile_frag="config/mh-ncr3000" + host_makefile_frag="${srcdir}/config/mh-ncr3000" ;; i[3456]86-*-sco3.2v5*) - host_makefile_frag="config/mh-sysv" + host_makefile_frag="${srcdir}/config/mh-sysv" ;; i[3456]86-*-sco*) # The native C compiler botches some simple uses of const. Unfortunately, # it doesn't defined anything like "__sco__" for us to test for in ansidecl.h. tentative_cc="cc -Dconst=" - host_makefile_frag="config/mh-sco" + host_makefile_frag="${srcdir}/config/mh-sco" ;; i[3456]86-*-udk*) - host_makefile_frag="config/mh-sysv5" + host_makefile_frag="${srcdir}/config/mh-sysv5" ;; i[3456]86-*-isc*) - host_makefile_frag="config/mh-sysv" + host_makefile_frag="${srcdir}/config/mh-sysv" ;; i[3456]86-*-solaris2*) - host_makefile_frag="config/mh-sysv4" + host_makefile_frag="${srcdir}/config/mh-sysv4" ;; i[3456]86-*-aix*) - host_makefile_frag="config/mh-aix386" + host_makefile_frag="${srcdir}/config/mh-aix386" ;; i[3456]86-*-msdosdjgpp*) - host_makefile_frag="config/mh-djgpp" + host_makefile_frag="${srcdir}/config/mh-djgpp" ;; *-cygwin*) - host_makefile_frag="config/mh-cygwin" + host_makefile_frag="${srcdir}/config/mh-cygwin" ;; *-mingw32*) - host_makefile_frag="config/mh-mingw32" + host_makefile_frag="${srcdir}/config/mh-mingw32" ;; *-interix*) - host_makefile_frag="config/mh-interix" + host_makefile_frag="${srcdir}/config/mh-interix" ;; vax-*-ultrix2*) # The old BSD pcc isn't up to compiling parts of gdb so use gcc tentative_cc=gcc ;; *-*-solaris2*) - host_makefile_frag="config/mh-solaris" + host_makefile_frag="${srcdir}/config/mh-solaris" ;; m68k-sun-sunos*) # Sun's C compiler needs the -J flag to be able to compile cp-parse.c @@ -1124,30 +1124,30 @@ ;; *-hp-hpux[78]*) tentative_cc="cc -Wp,-H256000" - host_makefile_frag="config/mh-hpux8" + host_makefile_frag="${srcdir}/config/mh-hpux8" ;; *-hp-hpux*) tentative_cc="cc -Wp,-H256000" - host_makefile_frag="config/mh-hpux" + host_makefile_frag="${srcdir}/config/mh-hpux" ;; *-*-hiux*) tentative_cc="cc -Wp,-H256000" - host_makefile_frag="config/mh-hpux" + host_makefile_frag="${srcdir}/config/mh-hpux" ;; rs6000-*-lynxos*) # /bin/cc is less than useful for our purposes. Always use GCC tentative_cc="/usr/cygnus/progressive/bin/gcc" - host_makefile_frag="config/mh-lynxrs6k" + host_makefile_frag="${srcdir}/config/mh-lynxrs6k" ;; *-*-lynxos*) # /bin/cc is less than useful for our purposes. Always use GCC tentative_cc="/bin/gcc" ;; *-*-sysv4*) - host_makefile_frag="config/mh-sysv4" + host_makefile_frag="${srcdir}/config/mh-sysv4" ;; *-*-sysv*) - host_makefile_frag="config/mh-sysv" + host_makefile_frag="${srcdir}/config/mh-sysv" ;; esac fi @@ -1156,7 +1156,7 @@ if test -n "${host_makefile_frag}" ; then for f in ${host_makefile_frag} do - cat ${srcdir}/$f >> mh-frag + cat $f >> mh-frag done host_makefile_frag=mh-frag fi @@ -1182,22 +1182,22 @@ case "${target}" in v810*) - target_makefile_frag="config/mt-v810" + target_makefile_frag="${srcdir}/config/mt-v810" ;; i[3456]86-*-netware*) - target_makefile_frag="config/mt-netware" + target_makefile_frag="${srcdir}/config/mt-netware" ;; powerpc-*-netware*) - target_makefile_frag="config/mt-netware" + target_makefile_frag="${srcdir}/config/mt-netware" ;; *-*-linux*) - target_makefile_frag="config/mt-linux" + target_makefile_frag="${srcdir}/config/mt-linux" ;; *-*-aix4.[3456789]* | *-*-aix[56789].*) - target_makefile_frag="config/mt-aix43" + target_makefile_frag="${srcdir}/config/mt-aix43" ;; mips*-*-pe | sh*-*-pe | *arm-wince-pe) - target_makefile_frag="config/mt-wince" + target_makefile_frag="${srcdir}/config/mt-wince" ;; esac @@ -1206,7 +1206,7 @@ alpha*-*-*) # This just makes sure to use the -mieee option to build target libs. # This should probably be set individually by each library. - alphaieee_frag="config/mt-alphaieee" + alphaieee_frag="${srcdir}/config/mt-alphaieee" ;; esac @@ -1216,13 +1216,13 @@ ospace_frag= case "${enable_target_optspace}:${target}" in yes:*) - ospace_frag="config/mt-ospace" + ospace_frag="${srcdir}/config/mt-ospace" ;; :d30v-*) - ospace_frag="config/mt-d30v" + ospace_frag="${srcdir}/config/mt-d30v" ;; :m32r-* | :d10v-* | :fr30-*) - ospace_frag="config/mt-ospace" + ospace_frag="${srcdir}/config/mt-ospace" ;; no:* | :*) ;; @@ -1235,7 +1235,7 @@ if test -n "${target_makefile_frag}${alphaieee_frag}${ospace_frag}" ; then for f in ${target_makefile_frag} ${alphaieee_frag} ${ospace_frag} do - cat ${srcdir}/$f >> mt-frag + cat $f >> mt-frag done target_makefile_frag=mt-frag fi