Sender: rich AT phekda DOT freeserve DOT co DOT uk Message-ID: <3DFC4F05.8EBEA54A@phekda.freeserve.co.uk> Date: Sun, 15 Dec 2002 09:44:37 +0000 From: Richard Dawe X-Mailer: Mozilla 4.77 [en] (X11; U; Linux 2.2.23 i586) X-Accept-Language: de,fr MIME-Version: 1.0 To: Eli Zaretskii CC: djgpp-workers AT delorie DOT com Subject: Re: Building tests with debug info using gcc 3.x [PATCH] References: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Reply-To: djgpp-workers AT delorie DOT com Hello. Eli Zaretskii wrote: > > On Sat, 14 Dec 2002, Richard Dawe wrote: > > > I'm not proposing to commit this, since I'm unclear which linker script > > we should be using: CVS or the one supplied with gcc? > > IIRC, there was some discussion about this several months, maybe a year, > ago. Could you please try to find it in the archives and see if there > was some conclusion? The thread is "gcc-3.0.1 and Win2k" from August 2001. Here's the key from a reply by Eli to a question by Andris: "> From: pavenis AT lanet DOT lv > Date: Fri, 24 Aug 2001 12:08:32 +0300 > > Shouldn't it be more correct to use script from from the source tree: > DJGPP_DJL := $(shell pwd)/$(TOP)/../../lib/djgpp.djl I don't think so: that could mean a chicken-and-egg problem. For example, the script in the djlsr distribution might not work with the version of GCC used to build the library. Also, the above requires a pwd command, which might not be installed. We are trying to avoid requesting any additional packages beyond the absolute minimum. I think the best way is to use the script which comes with the compiler used to compile the library: it's guaranteed to work (if it doesn't, they don't have a working installation)." Fair enough. So, I'd like to commit the patch. I've included it again below. Thanks, bye, Rich =] -- Richard Dawe [ http://www.phekda.freeserve.co.uk/richdawe/ ] Index: tests/makefile.inc =================================================================== RCS file: /cvs/djgpp/djgpp/tests/makefile.inc,v retrieving revision 1.3 diff -p -u -3 -r1.3 makefile.inc --- tests/makefile.inc 1 Feb 2001 19:38:30 -0000 1.3 +++ tests/makefile.inc 14 Dec 2002 16:36:28 -0000 @@ -1,3 +1,4 @@ +# Copyright (C) 2002 DJ Delorie, see COPYING.DJ for details # Copyright (C) 2001 DJ Delorie, see COPYING.DJ for details include $(TOP)/../makefile.def @@ -41,7 +42,10 @@ export LIBGCCA endif ifeq ($(DJGPP_DJL),) +DJGPP_DJL := $(shell $(CROSS_GCC) $(GCC_OPT) -print-file-name=djgpp-x.djl) +ifeq ($(DJGPP_DJL),djgpp-x.djl) DJGPP_DJL := $(shell $(CROSS_GCC) $(GCC_OPT) -print-file-name=djgpp.djl) +endif DJGPP_DJL := $(subst \,/,$(DJGPP_DJL)) export DJGPP_DJL endif