[Libreoffice-commits] .: 2 commits - connectivity/Library_postgresql-sdbc-impl.mk

[David Tardon]

 connectivity/Library_postgresql-sdbc-impl.mk |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 769e71ff8c06b9c23e25d7188f565d2879550000
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 17:25:07 2012 +0200

    do not link with cmt by default
    
    Change-Id: I7ed9a25d3b113ae0bda4f8ce47153b54270916f1

diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index f412c7a..da6fe98 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -50,6 +50,13 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 	shell32 \
 ))
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_ldflags,postgresql-sdbc-impl,\
+	/NODEFAULTLIB:libcmt.lib \
+))
+endif
+
 endif
 
 $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
commit d3829143ff1ee10b4c33bbacae9b01a67905d1fe
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 17:22:43 2012 +0200

    $(OUTDIR_FOR_BUILD) is wrong
    
    Change-Id: Id0c7564d7355192842c0b0b248bf21379ef104cb

diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index c31d225..f412c7a 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
 ifneq ($(SYSTEM_POSTGRESQL),YES)
 ifneq ($(GUI)$(COM),WNTMSC)
 
-include $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
+include $(OUTDIR)/inc/postgresql/libpq-flags.mk
 
 $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\
 	$(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--as-needed) \