aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-10-08 15:25:45 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-10-08 15:25:45 +0300
commit1541fb6f0cf4d9b66ab48029b226c83ee62233c6 (patch)
treef6671f44d3cc9c3c5dfbfb83d177a6d35565e7f8
parent6aea8696eacd6e93c2511eb359fc3193a41f61cb (diff)
Adapt for building with Clang on Windows
-rw-r--r--build/root.build6
-rw-r--r--tests/build/root.build6
2 files changed, 6 insertions, 6 deletions
diff --git a/build/root.build b/build/root.build
index 2e661b7..3da824c 100644
--- a/build/root.build
+++ b/build/root.build
@@ -11,11 +11,11 @@ ixx{*}: extension = ixx
txx{*}: extension = txx
cxx{*}: extension = cxx
-if ($cxx.class == 'msvc')
-{
+if ($cxx.target.system == 'win32-msvc')
cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+if ($cxx.class == 'msvc')
cxx.coptions += /wd4251 /wd4275 /wd4800
-}
# Load the cli module but only if it's available. This way a distribution
# that includes pre-generated files can be built without installing cli.
diff --git a/tests/build/root.build b/tests/build/root.build
index 8a98ddf..7b3693c 100644
--- a/tests/build/root.build
+++ b/tests/build/root.build
@@ -9,11 +9,11 @@ using cxx
hxx{*}: extension = hxx
cxx{*}: extension = cxx
-if ($cxx.class == 'msvc')
-{
+if ($cxx.target.system == 'win32-msvc')
cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+if ($cxx.class == 'msvc')
cxx.coptions += /wd4251 /wd4275 /wd4800
-}
# Every exe{} in this subproject is by default a test.
#