From:	pavenis AT lanet DOT lv
Message-ID:	<B0000100542@stargate.astr.lu.lv>
To:	Eli Zaretskii <eliz AT is DOT elta DOT co DOT il>, djgpp-workers AT delorie DOT com
Date:	Mon, 6 Sep 1999 12:59:43 +0300
MIME-Version:	1.0
Subject:	Re: new GCC port
References:	<B0000099319 AT stargate DOT astr DOT lu DOT lv>
In-reply-to:	<Pine.SUN.3.91.990905160000.20300g-100000@is>
X-mailer:	Pegasus Mail for Win32 (v3.12a)
Reply-To:	djgpp-workers AT delorie DOT com

I think so. DXE_LD_LIBRARY_PATH is name which is rather unlikely 
to be used for something else. I haven't rebuilt all stuff though. Maybe 
sometime later

Andris

On 5 Sep 99, at 16:01, Eli Zaretskii wrote:

> 
> On Wed, 25 Aug 1999 pavenis AT lanet DOT lv wrote:
> 
> > I think using environment variable TOP in dxegen.c can be dangerous 
> > if somebody will use it due to some other reason. As result that can 
> > break DXEGEN.EXE in some conditions.
> 
> Is the following better?
> 
> *** src/dxe/dxegen.c~1	Tue Aug 24 14:06:18 1999
> --- src/dxe/dxegen.c	Sat Sep  4 12:08:14 1999
> *************** int main(int argc, char **argv)
> *** 96,115 ****
>       strcpy(command, "ld");
>   #endif
>       strcat(command, " -X -S -r -o dxe__tmp.o -L");
> !     libdir = getenv("TOP");
>       if (libdir)
> !       strcat(command, "../../");
>       else
>       {
>         libdir = getenv("DJDIR");
>         if (!libdir)
>         {
> ! 	fprintf(stderr, "Error: neither DJDIR nor TOP are set in environment\n");
>   	exit(1);
>         }
>       }
> !     strcat(command, libdir);
> !     strcat(command, "/lib ");
>       for(i=3;argv[i];i++)
>       {
>         strcat(command, argv[i]);
> --- 96,116 ----
>       strcpy(command, "ld");
>   #endif
>       strcat(command, " -X -S -r -o dxe__tmp.o -L");
> !     libdir = getenv("DXE_LD_LIBRARY_PATH");
>       if (libdir)
> !       strcat(command, libdir);
>       else
>       {
>         libdir = getenv("DJDIR");
>         if (!libdir)
>         {
> ! 	fprintf(stderr, "Error: neither DXE_LD_LIBRARY_PATH nor DJDIR are set in environment\n");
>   	exit(1);
>         }
> +       strcat(command, libdir);
> +       strcat(command, "/lib");
>       }
> !     strcat(command, " ");
>       for(i=3;argv[i];i++)
>       {
>         strcat(command, argv[i]);
> *** src/libemu/makefile.~0	Sun Sep 27 23:07:54 1998
> --- src/libemu/makefile	Sat Sep  4 12:16:36 1999
> ***************
> *** 1,7 ****
>   # Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details
>   # Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details
>   TOP=.
> ! export TOP
>   
>   LIBNAME=emu
>   
> --- 1,9 ----
> + # Copyright (C) 1999 DJ Delorie, see COPYING.DJ for details
>   # Copyright (C) 1998 DJ Delorie, see COPYING.DJ for details
>   # Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details
>   TOP=.
> ! DXE_LD_LIBRARY_PATH=$(TOP)/../../lib
> ! export DXE_LD_LIBRARY_PATH
>   
>   LIBNAME=emu
>   
> 
> 

- Raw text -