strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pgsql-sdbc: put libs libpq needs *before* libpq in the link line

Browse source
This commit is contained in:
Lionel Elie Mamane 2012-02-02 18:37:49 +01:00
parent dde025efac
commit 1f741dfeea
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
connectivity/source/drivers/postgresql/makefile.mk
View file

@ -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