aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-10-06 21:29:48 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-10-06 21:29:48 +0300
commita90eecb47438303ae3f6409276f8d9bb77c9f6fc (patch)
tree011687ef5d26e61fe1add24c96309cac9c449cd2
parentc4832361e3c1ab4cc04051385cdd645954fed8d2 (diff)
Adapt for building with Clang on Windows
-rw-r--r--build/root.build6
-rw-r--r--build2/buildfile4
2 files changed, 5 insertions, 5 deletions
diff --git a/build/root.build b/build/root.build
index 9dbad8d..4929cc0 100644
--- a/build/root.build
+++ b/build/root.build
@@ -13,11 +13,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
-}
cxx.poptions =+ "-I$out_root" "-I$src_root"
diff --git a/build2/buildfile b/build2/buildfile
index b8f7f95..44ec2a8 100644
--- a/build2/buildfile
+++ b/build2/buildfile
@@ -44,8 +44,8 @@ else
else
stack_size = 4194304 # 4M
- cxx.loptions += ($cxx.class == 'msvc' \
- ? "/STACK:$stack_size" \
+ cxx.loptions += ($cxx.target.system == 'win32-msvc' \
+ ? "/STACK:$stack_size" \
: "-Wl,--stack,$stack_size")
}