diff options
| author | Pavan Deolasee | 2015-06-17 09:41:55 +0000 |
|---|---|---|
| committer | Pavan Deolasee | 2015-06-17 09:41:55 +0000 |
| commit | f2b95d5434b1692df81ebadbdab8bcd7b9ad7bcc (patch) | |
| tree | 52c6b22c236cc3e40b0b538d8f79d169e4d63de9 | |
| parent | 834a41f392696f2f5245cc337180b290c790e5ec (diff) | |
Do not add pthread to LDFLAGS at the top level Makefile.
This was added in XC/XL, may be for building GTM, but this creates problems in
symbol resolution where the system library symbols are used over those
redefined in src/port. This patch fixes that issue
| -rw-r--r-- | src/Makefile.global.in | 4 | ||||
| -rw-r--r-- | src/backend/Makefile | 6 |
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 |