[Libreoffice-commits] core.git: external/mysqlcppconn

[Norbert Thiebaud]

 external/mysqlcppconn/Library_mysqlcppconn.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 67034cb6689645cf8eed497444ea4b1ba7ca3848
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Sep 5 12:52:56 2014 +0200

    mariadb iconv dep apparently is only for Mac
    
    Change-Id: Ic49fa8c62eb7ce01e4488bc32ef9167a9b77662d

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 2d9b353..3a5da71 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -24,11 +24,13 @@ $(eval $(call gb_Library_add_libs,mysqlcppconn,\
 
 endif
 
+ifeq ($(OS),MACOSX)
 ifeq ($(SYSTEM_MARIADB),)
 $(eval $(call gb_Library_use_externals,mysqlcppconn,\
 	    iconv \
 ))
 endif
+endif
 
 $(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn))