From f1d5f23b7f4aa8ceab460df30448bc4f21f74bcc Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 7 Oct 2019 22:41:10 +0300
Subject: Release version 8.0.15+3

Adapt for building with Clang on Windows
---
 libmysqlclient/build/root.build       | 6 +++---
 libmysqlclient/manifest               | 2 +-
 libmysqlclient/mysql/buildfile        | 4 +++-
 libmysqlclient/tests/build/root.build | 6 +++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libmysqlclient/build/root.build b/libmysqlclient/build/root.build
index 04449b6..dbecc7f 100644
--- a/libmysqlclient/build/root.build
+++ b/libmysqlclient/build/root.build
@@ -16,8 +16,8 @@ using cxx
 hxx{*}: extension = h
 cxx{*}: extension = cc
 
-if ($c.class == 'msvc')
-{
+if ($c.target.system == 'win32-msvc')
   cc.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+if ($c.class == 'msvc')
   cc.coptions += /wd4251 /wd4275 /wd4800
-}
diff --git a/libmysqlclient/manifest b/libmysqlclient/manifest
index e70e1ad..55b3bb1 100644
--- a/libmysqlclient/manifest
+++ b/libmysqlclient/manifest
@@ -3,7 +3,7 @@ name: libmysqlclient
 
 # Note: remember to update doc-url below!
 #
-version: 8.0.15+2
+version: 8.0.15+3
 
 project: mysql
 summary: MySQL C API client library
diff --git a/libmysqlclient/mysql/buildfile b/libmysqlclient/mysql/buildfile
index 03097c5..85690ae 100644
--- a/libmysqlclient/mysql/buildfile
+++ b/libmysqlclient/mysql/buildfile
@@ -13,6 +13,8 @@ bsd     = ($tclass == 'bsd')
 macos   = ($tclass == 'macos')
 windows = ($tclass == 'windows')
 
+msvc_runtime = ($tsys == 'win32-msvc')
+
 gcc  = ($c.class == 'gcc')
 msvc = ($c.class == 'msvc')
 
@@ -238,7 +240,7 @@ if! $windows
     cc.libs += -lrt # Posix timers.
 }
 else
-  cc.libs += $regex.apply(advapi32, '(.+)', $msvc ? '\1.lib' : '-l\1')
+  cc.libs += $regex.apply(advapi32, '(.+)', $msvc_runtime ? '\1.lib' : '-l\1')
 
 # Export options.
 #
diff --git a/libmysqlclient/tests/build/root.build b/libmysqlclient/tests/build/root.build
index 7270216..f4a8a9f 100644
--- a/libmysqlclient/tests/build/root.build
+++ b/libmysqlclient/tests/build/root.build
@@ -7,11 +7,11 @@ using c
 h{*}: extension = h
 c{*}: extension = c
 
-if ($c.class == 'msvc')
-{
+if ($c.target.system == 'win32-msvc')
   c.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+if ($c.class == 'msvc')
   c.coptions += /wd4251 /wd4275 /wd4800
-}
 
 # Every exe{} in this subproject is by default a test.
 #
-- 
cgit v1.1