summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.global.in4
-rw-r--r--src/backend/Makefile6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 0d103f1e53..1287c0d2eb 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -257,9 +257,9 @@ ld_R_works = @ld_R_works@
# something.
# PGXC_BEGIN
ifdef PGXS
- LDFLAGS = -L$(libdir) -lpthread
+ LDFLAGS = -L$(libdir)
else
- LDFLAGS = -L$(top_builddir)/src/port -L$(top_builddir)/src/common -lpthread
+ LDFLAGS = -L$(top_builddir)/src/port -L$(top_builddir)/src/common
endif
# PGXC_END
LDFLAGS += @LDFLAGS@
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 517bafee77..ad175be511 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -40,6 +40,8 @@ endif
endif
OBJS = $(SUBDIROBJS) $(LOCALOBJS) \
+ $(top_builddir)/src/port/libpgport_srv.a \
+ $(top_builddir)/src/common/libpgcommon_srv.a \
$(top_builddir)/src/interfaces/libpq/fe-connect.o \
$(top_builddir)/src/interfaces/libpq/fe-secure.o \
$(top_builddir)/src/interfaces/libpq/fe-misc.o \
@@ -48,11 +50,9 @@ OBJS = $(SUBDIROBJS) $(LOCALOBJS) \
$(top_builddir)/src/interfaces/libpq/fe-exec.o \
$(top_builddir)/src/interfaces/libpq/fe-auth.o \
$(top_builddir)/src/interfaces/libpq/pqexpbuffer.o \
- $(top_builddir)/src/port/libpgport_srv.a \
$(top_builddir)/src/gtm/client/libgtmclient.a \
$(top_builddir)/src/gtm/common/libgtm.a \
- $(top_builddir)/src/gtm/libpq/libpqcomm.a \
- $(top_builddir)/src/common/libpgcommon_srv.a
+ $(top_builddir)/src/gtm/libpq/libpqcomm.a
# We put libpgport and libpgcommon into OBJS, so remove it from LIBS; also add
# libldap