diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2012-02-02 18:37:49 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2012-02-02 18:38:36 +0100 |
| commit | 1f741dfeeab848424b91420390d2853572056e00 (patch) | |
| tree | 7c5cafca00c07f9b7ea7b9a06abe1cc7c7d93cad /connectivity | |
| parent | I added some links and removed the ok button (diff) | |
| download | core-1f741dfeeab848424b91420390d2853572056e00.tar.gz core-1f741dfeeab848424b91420390d2853572056e00.zip | |
pgsql-sdbc: put libs libpq needs *before* libpq in the link line
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 3900d21d1fc7..8a831a6f20eb 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -88,14 +88,13 @@ LIBPQ_DEP_LIBS += \ LIBPQ_DEP_LIBS+=\ $(LDAPSDKLIB) .ENDIF -.ELSE +.ELSE # "$(GUI)$(COM)"!="WNTMSC" LIBPQ_LINK=$(OUTDIR)/lib/libpq.a LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--as-needed) .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed) .ENDIF POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql -POSTGRESQL_LIB= .ENDIF # SYSTEM_POSTGRESQL CFLAGS+=$(POSTGRESQL_INC) \ @@ -161,8 +160,8 @@ SHL2STDLIBS= \ $(SALLIB) \ $(SALHELPERLIB) \ $(POSTGRESQL_LIB) \ - $(LIBPQ_LINK) \ - $(LIBPQ_DEP_LIBS) + $(LIBPQ_DEP_LIBS) \ + $(LIBPQ_LINK) SHL2LIBS= $(LIB2TARGET) SHL2DEF= $(MISC)/$(SHL2TARGET).def |