Allow win32/cygwin link against the first matching library symbol rather

than erroring out.  This is the Unix behavior.

diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 6fe3af18dc6274f3d4961e39c7686d281fd61284..bdb8a9bec1868b499c7480af8cf9ab6ad592559f 100644 (file)
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.57 2004/10/07 13:45:48 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.58 2004/11/08 05:23:23 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,12 +22,6 @@ OBJS=        pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
 
 EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o
 
-# Not sure why MinGW needs this but it prevents a link failure
-# of duplicate definitions for pg_tolower().  2004-10-06
-ifeq ($(PORTNAME), win32)
-EXTRA_OBJS += $(top_builddir)/src/port/exec.o
-endif
-
 all: submake-libpq submake-libpgport submake-backend pg_dump pg_restore pg_dumpall
 
 pg_dump: pg_dump.o common.o pg_dump_sort.o $(OBJS) $(libpq_builddir)/libpq.a 

diff --git a/src/template/cygwin b/src/template/cygwin
index 9b342ba8ab5094e504f4bc1577747b27d7f54609..ae7bb16bd183c73ff4b25a1e75b5e05e12e9fe5d 100644 (file)
--- a/src/template/cygwin
+++ b/src/template/cygwin
@@ -1 +1,6 @@
 SRCH_LIB="/usr/local/lib"
+
+# This is required to link pg_dump because it finds pg_toupper() in
+# libpq and pgport
+LDFLAGS="-Wl,--allow-multiple-definition"
+

diff --git a/src/template/win32 b/src/template/win32
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e9ab1fe7a54efa9f6453a564791b44555d21ae90 100644 (file)
--- a/src/template/win32
+++ b/src/template/win32
@@ -0,0 +1,4 @@
+# This is required to link pg_dump because it finds pg_toupper() in
+# libpq and pgport
+LDFLAGS="-Wl,--allow-multiple-definition"
+