aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-10-08 13:58:55 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-10-08 14:46:26 +0300
commit0d191af061595e17a341edfb887f1679a8cbd893 (patch)
tree882e70b31cc90ab1fb3a3e8b6c25f64e83348827
parent230ecf37a2d8c68d677198563cd13208bc2720b8 (diff)
Adapt for building with Clang on Windows
-rw-r--r--build/.gitignore3
-rw-r--r--build/root.build6
-rw-r--r--tests/.gitignore1
-rw-r--r--tests/build/.gitignore3
-rw-r--r--tests/build/root.build6
5 files changed, 13 insertions, 6 deletions
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..4a730a3
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,3 @@
+config.build
+root/
+bootstrap/
diff --git a/build/root.build b/build/root.build
index 0cdf286..653ded7 100644
--- a/build/root.build
+++ b/build/root.build
@@ -11,8 +11,8 @@ 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
-}
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..e54525b
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1 @@
+driver
diff --git a/tests/build/.gitignore b/tests/build/.gitignore
new file mode 100644
index 0000000..4a730a3
--- /dev/null
+++ b/tests/build/.gitignore
@@ -0,0 +1,3 @@
+config.build
+root/
+bootstrap/
diff --git a/tests/build/root.build b/tests/build/root.build
index 216fa84..da6ff40 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.
#