diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-03-01 09:55:05 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-03-01 09:57:51 +0100 |
| commit | a42649c6743a54498375903b4357c4c0545fbab8 (patch) | |
| tree | 5da81281c4e9830fec56554c29cdcae6e7a8d5fd | |
| parent | c7ef87aa8db6d892491891dcda6bfbaa1ad1d0d2 (diff) | |
fdo#60907 Use *one* variable for the MySQL library file
as opposed to two with different values,
which leads to trouble
Change-Id: Ic603105187b6078bd46d6c253410af28e188c70f
| -rw-r--r-- | mysqlc/Library_mysqlc.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index d97328afbe87..cf77bc057761 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -35,15 +35,13 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\ cppuhelper \ )) -MYSQL_LIBFILE :=$(if $(filter WNT,$(OS)),libmysql.dll,$(if $(filter MACOSX,$(OS)),libmysql.16.dylib,libmysql.so.16)) - $(eval $(call gb_Library_add_defs,mysqlc,\ -DCPPDBC_EXPORTS \ -DCPPCON_LIB_BUILD \ -DMYSQLC_VERSION_MAJOR=$(MYSQLC_MAJOR) \ -DMYSQLC_VERSION_MINOR=$(MYSQLC_MINOR) \ -DMYSQLC_VERSION_MICRO=$(MYSQLC_MICRO) \ - $(if $(filter NO,$(SYSTEM_MYSQL)),-DMYSQL_LIB=\"$(MYSQL_LIBFILE)\") \ + $(if $(filter NO,$(SYSTEM_MYSQL)),-DMYSQL_LIB=\"$(LIBMYSQL)\") \ $(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\ -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \ )) |