mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-15 08:20:16 +08:00
Allow win32/cygwin link against the first matching library symbol rather
than erroring out. This is the Unix behavior.
This commit is contained in:
parent
3a372d61d0
commit
0d3b8e9a50
@ -5,7 +5,7 @@
|
|||||||
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
|
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
|
||||||
# Portions Copyright (c) 1994, Regents of the University of California
|
# 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
|
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
|
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
|
pg_dump: pg_dump.o common.o pg_dump_sort.o $(OBJS) $(libpq_builddir)/libpq.a
|
||||||
|
@ -1 +1,6 @@
|
|||||||
SRCH_LIB="/usr/local/lib"
|
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"
|
||||||
|
|
||||||
|
@ -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"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user