[Libreoffice-commits] .: connectivity/source

Lionel Elie Mamane lmamane at kemper.freedesktop.org
Mon Dec 12 14:07:23 PST 2011


 connectivity/source/drivers/postgresql/makefile.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 1a658dda70d2e139d124d60d64691356c9414f3e
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Mon Dec 12 23:07:03 2011 +0100

    postgresql-sdbc: do not use GNU ld-specific options on MacOS X

diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index 7506efd..3f9bfb5 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -91,10 +91,17 @@ LIBPQ_DEP_LIBS+=\
 .ENDIF
 .ELSE
 LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
+.IF "$(GUI)"=="MAC"
+LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs
+.ELSE
 LIBPQ_DEP_LIBS += -Wl,--as-needed
+.ENDIF
 .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
+.IF "$(GUI)"=="MAC"
+.ELSE
 LIBPQ_DEP_LIBS += -Wl,--no-as-needed
 .ENDIF
+.ENDIF
 POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
 POSTGRESQL_LIB=
 .ENDIF # SYSTEM_POSTGRESQL


More information about the Libreoffice-commits mailing list