X-Authentication-Warning: delorie.com: mail set sender to djgpp-bounces using -f
X-Recipient: djgpp AT delorie DOT com
X-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        bh=kDyWbju333SeCz+RGzwm2i21avFsg/pSfuqwt2UPKIQ=;
        b=WPhIzyO4wbMSYlcDc5ixj/XNMmB0A2DlMHpvhw/iutgfXNIydY0uX4Vko1D2l8pNtH
         hTqVfZd6drmk4qSuCa+T3FOT50Ix+pxVQ70aXLVypo2vicG/KbGwEO2pk4XqjgycucUy
         6Q9TsKGxK6aLDa+VgNOjnc2whWOIo0XspFcak0ALMwDx/2kOyq8cwFw5EBxsOLJoPBUS
         oWb2IB1sifg1IrCDzK/VaGVRUbDN/XvSfWXYgRJ1bZg7vCob6GzrPS6vp4TS68wPizqI
         vmWrcaXv1tHJoQdOiziWfHLddepY1xb/h7ljzGAUQ/now2N22BYZw2R7RT4wbJZDP7P5
         KjCQ==
MIME-Version: 1.0
X-Received: by 10.42.104.143 with SMTP id r15mr14543853ico.33.1432385506287;
 Sat, 23 May 2015 05:51:46 -0700 (PDT)
In-Reply-To: <83617j39q4.fsf@gnu.org>
References: <201505042003 DOT t44K3odg011007 AT delorie DOT com>
	<CAA2C=vBYHht1qs_b-_a0V_W4Za_km4RqAVyLYTj+=090cSjQAw AT mail DOT gmail DOT com>
	<83617j39q4 DOT fsf AT gnu DOT org>
Date: Sat, 23 May 2015 15:51:46 +0300
Message-ID: <CAA2C=vA6wgvYqZZ6crTxhSy6nNPOarvBrvv0uNpa=rF6VO0KxA@mail.gmail.com>
Subject: Re: ANNOUNCE: DJGPP 2.05 beta 1
From: "Ozkan Sezer (sezeroz AT gmail DOT com)" <djgpp AT delorie DOT com>
To: djgpp AT delorie DOT com
Content-Type: text/plain; charset=UTF-8
Reply-To: djgpp AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

On 5/23/15, Eli Zaretskii (eliz AT gnu DOT org) <djgpp AT delorie DOT com> wrote:
>> Date: Sat, 23 May 2015 12:24:08 +0300
>> From: "Ozkan Sezer (sezeroz AT gmail DOT com)" <djgpp AT delorie DOT com>
>>
>> Using an unmodified 2.03-based toolchain/djgpp environment,
>> current cvs fails like the following:
>>
>> ../../../lib/libc.a(crt1.o)(.text+0x25d):crt1.c: undefined reference
>> to `_environ'
>> ../../../lib/libc.a(crt1.o)(.text+0x2c4):crt1.c: undefined reference
>> to `_environ'
>> ../../../lib/libc.a(crt1.o)(.text+0x2d0):crt1.c: undefined reference
>> to `_environ'
>> ../../../lib/libc.a(crt1.o)(.text+0x2f7):crt1.c: undefined reference
>> to `_environ'
>> ../../../lib/libc.a(crt1.o)(.text+0x516):crt1.c: undefined reference
>> to `_environ'
>> ../../../lib/libc.a(spawnvp.o)(.text+0x11):spawnvp.c: more undefined
>> references to `_environ' follow
>> make.exe[3]: *** [../../../bin/symify.exe] Error 1
>>
>> However, if I specify djgpp.djl on the make line, like:
>>   make DJGPP_DJL=c:/v205/lib/djgpp.djl
>> ... then build happily succeeds.
>>
>> Why are we using the toolchain-provided linker script instead
>> of source tree-provided one?  If this was an oversight, I can
>> easily change this.
>
> I'm guessing that no one envisioned the linker script will be ever
> modified.
>
> Using the script from the source tree is TRT, IMO.
>
> Thanks.
>

OK then, applied the following:

* src/makefile.inc: use source tree-provided djgpp.djl, instead of
  toolchain-provided one. (and do not export DJGPP_DJL so that this
  actually works.)

Index: src/makefile.inc
===================================================================
RCS file: /cvs/djgpp/djgpp/src/makefile.inc,v
retrieving revision 1.16
diff -u -r1.16 makefile.inc
--- src/makefile.inc	30 Apr 2015 18:50:42 -0000	1.16
+++ src/makefile.inc	23 May 2015 11:01:32 -0000
@@ -131,12 +131,8 @@
 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
+DJGPP_DJL = $(LIB)/djgpp.djl
+#export DJGPP_DJL
 endif

 LINK = $(CROSS_LD) -s $(LDFLAGS) $(filter %.o,$^) $(filter-out
%.o,$^) -o $@ $(LIBGCCA) -T $(DJGPP_DJL)

--