Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit bac78bb

Browse files
committed
Update Cygwin build to not use DLLINIT, per Cygwin report from Reini
Urban
1 parent 0fd3783 commit bac78bb

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/Makefile.shlib

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.81 2004/10/12 04:48:34 neilc Exp $
9+
# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.82 2004/10/12 22:20:17 momjian Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -309,14 +309,11 @@ endif # PORTNAME == beos
309309
else # PORTNAME == cygwin
310310

311311
# Cygwin case
312-
$(shlib) lib$(NAME).a: $(OBJS) $(DLLINIT)
312+
$(shlib) lib$(NAME).a: $(OBJS)
313313
$(DLLTOOL) --export-all $(DLLTOOL_DEFFLAGS) --output-def $(NAME).def $(OBJS)
314-
$(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(DLLINIT) $(SHLIB_LINK)
314+
$(DLLWRAP) -o $(shlib) --dllname $(shlib) $(DLLWRAP_FLAGS) --def $(NAME).def $(OBJS) $(SHLIB_LINK)
315315
$(DLLTOOL) --dllname $(shlib) $(DLLTOOL_LIBFLAGS) --def $(NAME).def --output-lib lib$(NAME).a
316316

317-
$(DLLINIT): $(DLLINIT:%.o=%.c)
318-
$(MAKE) -C $(@D) $(@F)
319-
320317
endif # PORTNAME == cygwin
321318

322319
else # PORTNAME == win32

0 commit comments

Comments
 (0)