connectivity/source/drivers/postgresql/makefile.mk | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 1f741dfeeab848424b91420390d2853572056e00
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Thu Feb 2 18:37:49 2012 +0100
pgsql-sdbc: put libs libpq needs *before* libpq in the link line
diff --git a/connectivity/source/drivers/postgresql/makefile.mk
b/connectivity/source/drivers/postgresql/makefile.mk
index 3900d21..8a831a6 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
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
