This is the mail archive of the cygwin-developers@sourceware.cygnus.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: winsup reorg completed


On Fri, Jan 07, 2000 at 07:02:25PM -0600, Mumit Khan wrote:
>Chris Faylor <cgf@cygnus.com> writes:
>> 
>> I don't know why this is happening.  I assume that you're compiling
>> in the same directory as the source?
>
>I'll look at it after dinner tonight, unless someone figures it out
>before that.

I figured it out.  It's my usual compulsive need not to see
"/foo/../../bar" in directory paths.  Patch below.

>> >The real problem: I can't link anymore.
>> 
>> You need a newer linker.  The one from the CD should work but probably
>> Mumit's version is better.
>
>Ah, thanks for the reminder. Corinna, I'll upload my current binutils
>tree later this evening (source + binaries) that's based on 1999-09-11 
>CVS + patches. I'll send a note when it's done. 

Thanks, Mumit.

cgf

Index: Makefile.common
===================================================================
RCS file: /cvs/cvsfiles/devo/winsup/Makefile.common,v
retrieving revision 1.3
diff -u -r1.3 Makefile.common
--- Makefile.common	2000/01/07 04:30:52	1.3
+++ Makefile.common	2000/01/08 01:08:34
@@ -16,28 +16,30 @@
 MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/gotham/src/comp-tools/winsup/dlmalloc
 MALLOC_OBJ:=#/gotham/src/comp-tools/winsup/dlmalloc/malloc.o
 
-ifneq (,${findstring /,$(srcdir)})
-    updir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(srcdir)):::}}
-else
+ifeq (,${findstring /,$(srcdir)})
     updir:=$(srcdir)/..
-endif
-
+    updir1:=$(updir)/..
+else
+    updir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(srcdir)):::}}
 ifneq (,${findstring /,$(updir)})
     updir1:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(updir)):::}}
 else
     updir1:=$(updir)/..
 endif
+endif
+
 
 pwd:=${shell pwd}
-ifneq (,${findstring /,$(pwd)})
-    bupdir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(pwd)):::}}
+ifeq (,${findstring /,$(pwd)})
+    bupdir:=..
+    bupdir1:=../..
 else
-    bupdir:=$(pwd)/..
-endif
+    bupdir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(pwd)):::}}
 ifneq (,${findstring /,$(bupdir)})
     bupdir1:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(bupdir)):::}}
 else
     bupdir1:=$(bupdir)/..
+endif
 endif
 
 w32api_source:=$(updir)/w32api

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]