From: pavenis AT lanet DOT lv
To: "Eli Zaretskii" <eliz AT is DOT elta DOT co DOT il>, djgpp-workers AT delorie DOT com
Date: Fri, 24 Aug 2001 12:08:32 +0300
MIME-Version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7BIT
Subject: Re: gcc-3.0.1 and Win2k
Message-ID: <3B8643C0.19077.5BA1DC@localhost>
In-reply-to: <2950-Fri24Aug2001111033+0300-eliz@is.elta.co.il>
References: <Pine DOT A41 DOT 4 DOT 05 DOT 10108232014050 DOT 34078-100000 AT ieva06 DOT lanet DOT lv>	(message from Andris Pavenis on Thu, 23 Aug 2001 20:30:48 +0300 (WET))
X-mailer: Pegasus Mail for Win32 (v3.12c)
Reply-To: djgpp-workers AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp-workers AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

On 24 Aug 2001, at 11:10, Eli Zaretskii wrote:

> > Date: Thu, 23 Aug 2001 20:30:48 +0300 (WET)
> > From: Andris Pavenis <pavenis AT lanet DOT lv>
> > > 
> > > Building programs seems to work just fine, but I hit a problem with
> > > building the CVS library.  The problem is that we have this in
> > > src/makefile.inc:
> > > 
> > >   DJGPP_DJL := $(shell $(CROSS_GCC) $(GCC_OPT) -print-file-name=djgpp.djl)
> > > 
> > > This asks the compiler for the full name of the linker script, but
> > > since the script is called djgpp.djl, this command cannot pick
> > > djgpp-x.djl which comes with the GCC distribution.
> 
> Okay, how about the following change?  As they say, ``it works for
> me''.  Can this make any trouble for cross-compiled environments?
> 
> Index: src/makefile.inc
> ===================================================================
> RCS file: /cvs/djgpp/djgpp/src/makefile.inc,v
> retrieving revision 1.6
> diff -u -r1.6 makefile.inc
> --- src/makefile.inc	2001/06/12 13:03:15	1.6
> +++ src/makefile.inc	2001/08/24 08:09:43
> @@ -112,7 +112,10 @@
>  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

Shouldn't it be more correct to use script from from the source tree:
	DJGPP_DJL := $(shell pwd)/$(TOP)/../../lib/djgpp.djl

Seems that this works (I tested only 'make -C debug') after moving 
away $DJDIR/lib/djgpp.djl

Andris