aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-10-08 12:07:37 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-10-08 12:11:33 +0300
commit033efa5b9a61f650915b6a0884904275444108f3 (patch)
treee0bbcde80593bef70573268f8d47277dcfde1073
parentd5fe771fe957b15ba1b5f8ae96ceb46708444267 (diff)
Adapt for building with Clang on Windows
-rw-r--r--build/root.build6
-rw-r--r--examples/build/.gitignore2
-rw-r--r--examples/build/root.build6
-rw-r--r--tests/build/root.build6
4 files changed, 14 insertions, 6 deletions
diff --git a/build/root.build b/build/root.build
index 561e38a..efe6fca 100644
--- a/build/root.build
+++ b/build/root.build
@@ -13,8 +13,8 @@ txx{*}: extension = txx
using c
-if ($cxx.class == 'msvc')
-{
+if ($cxx.target.system == 'win32-msvc')
cc.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+if ($cxx.class == 'msvc')
cc.coptions += /wd4251 /wd4275 /wd4800
-}
diff --git a/examples/build/.gitignore b/examples/build/.gitignore
index 225c27f..4a730a3 100644
--- a/examples/build/.gitignore
+++ b/examples/build/.gitignore
@@ -1 +1,3 @@
config.build
+root/
+bootstrap/
diff --git a/examples/build/root.build b/examples/build/root.build
index 8f1757f..121d777 100644
--- a/examples/build/root.build
+++ b/examples/build/root.build
@@ -9,6 +9,12 @@ using cxx
hxx{*}: extension = hxx
cxx{*}: extension = cxx
+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.
#
exe{*}: test = true
diff --git a/tests/build/root.build b/tests/build/root.build
index de22341..f4838d0 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.
#