git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix pg_rewind link order issue introduced in 927474ce1a2.

author Andres Freund <andres@anarazel.de>

2019年9月30日 19:43:09 +0000 (12:43 -0700)

committer Andres Freund <andres@anarazel.de>

2019年9月30日 19:43:09 +0000 (12:43 -0700)

The aforementioned commit orders the link to pgfeutils after libpq,
which can fail because pgfeutils uses symbols from libpq.

Per buildfarm animal jacana.

Author: Andres Freund
Discussion: https://postgr.es/m/20190930192013.r3wievljua2n3tbb@alap3.anarazel.de

src/bin/pg_rewind/Makefile patch | blob | blame | history

diff --git a/src/bin/pg_rewind/Makefile b/src/bin/pg_rewind/Makefile

index 98fb381c629c748d48b134d13945e132de2810bf..7a97df660b5c1b3bda8f7214f41fb33bc32284d9 100644 (file)

--- a/src/bin/pg_rewind/Makefile

+++ b/src/bin/pg_rewind/Makefile

@@ -16,7 +16,7 @@ top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

override CPPFLAGS := -I$(libpq_srcdir) -DFRONTEND $(CPPFLAGS)

-LDFLAGS_INTERNAL += $(libpq_pgport) -L$(top_builddir)/src/fe_utils -lpgfeutils

+LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)

OBJS = pg_rewind.o parsexlog.o xlogreader.o datapagemap.o timeline.o \

fetch.o file_ops.o copy_fetch.o libpq_fetch.o filemap.o \

This is the main PostgreSQL git repository.

RSS Atom