diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-12 18:22:54 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-12-12 19:31:53 +0100 |
| commit | 5438fef04f0e1cdc114b645d50bec94cea17c6da (patch) | |
| tree | 24ef59e342c2838d3cbd02b97e500be222ec2164 /connectivity | |
| parent | 914d1fc4644e5ce39085653fd8deda33e79bba3b (diff) | |
postgresql-sdbc: get libpq link deps from postgresql build system
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 160e305118a1..7506efd1045b 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -81,20 +81,23 @@ LIBPQ_DEP_LIBS= .IF "$(SYSTEM_POSTGRESQL)"=="YES" LIBPQ_LINK=-lpq .ELSE #SYSTEM_POSTGRESQL==NO +.IF "$(GUI)$(COM)"=="WNTMSC" +LIBPQ_LINK:=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib LIBPQ_DEP_LIBS += \ $(OPENSSLLIB) .IF "$(WITH_LDAP)" == "YES" LIBPQ_DEP_LIBS+=\ $(LDAPSDKLIB) .ENDIF -.IF "$(GUI)$(COM)"=="WNTMSC" -LIBPQ_LINK=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib .ELSE LIBPQ_LINK=$(OUTDIR)/lib/libpq.a +LIBPQ_DEP_LIBS += -Wl,--as-needed +.INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk +LIBPQ_DEP_LIBS += -Wl,--no-as-needed .ENDIF POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql POSTGRESQL_LIB= -.ENDIF +.ENDIF # SYSTEM_POSTGRESQL CFLAGS+=$(POSTGRESQL_INC) \ -DPQ_SDBC_MAJOR=$(PQ_SDBC_MAJOR) \ |