diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-10-12 22:20:17 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-10-12 22:20:17 +0000 |
| commit | bac78bbac67a3b59f8cc56ecea82976038950cf1 (patch) | |
| tree | 839ecfa08639e9f761c05898bdacaaec585624a9 /src | |
| parent | 0fd37839d9b45158a301a767b14fee0ace9d4332 (diff) | |
| download | postgresql-bac78bbac67a3b59f8cc56ecea82976038950cf1.tar.gz postgresql-bac78bbac67a3b59f8cc56ecea82976038950cf1.zip | |
Update Cygwin build to not use DLLINIT, per Cygwin report from Reini
Urban
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.shlib | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 1009b27d081..973cc68a36d 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.81 2004/10/12 04:48:34 neilc Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.82 2004/10/12 22:20:17 momjian Exp $ # #------------------------------------------------------------------------- @@ -309,14 +309,11 @@ endif # PORTNAME == beos else # PORTNAME == cygwin # Cygwin case -$(shlib) lib$(NAME).a: $(OBJS) $(DLLINIT) +$(shlib) lib$(NAME).a: $(OBJS) $(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS) - $(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(DLLINIT) $(SHLIB_LINK) + $(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK) $(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a -$(DLLINIT): $(DLLINIT:%.o=%.c) - $(MAKE) -C $(@D) $(@F) - endif # PORTNAME == cygwin else # PORTNAME == win32 |