aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-04-15 15:42:17 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-04-15 15:42:17 +0200
commit14addc7e868d298f7399d20ac54a42d34151c07c (patch)
tree0995f3477d7af5cfa67d11fa2968502670f4fda2
parentdfbe3c437fcbf91ef876a0a0f3e34beec5f5f2a8 (diff)
Disable modules support in VC 16.8 and later due to options change
See GitHub issue #134 for background.
-rw-r--r--libbuild2/cxx/init.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx
index 077e3fd..0bbab52 100644
--- a/libbuild2/cxx/init.cxx
+++ b/libbuild2/cxx/init.cxx
@@ -360,9 +360,12 @@ namespace build2
// which makes them pretty much unusable. This has been fixed in
// 15.3 (19.11). And 15.5 (19.12) supports the `export module
// M;` syntax. And 16.4 (19.24) supports the global module
- // fragment.
+ // fragment. And in 16.8 all the modules-related options have
+ // been changed. Seeing that the whole thing is unusable anyway,
+ // we disable it for 16.8 or later for now.
//
- if (mj > 19 || (mj == 19 && mi >= (modules.value ? 10 : 12)))
+ if ((mj > 19 || (mj == 19 && mi >= (modules.value ? 10 : 12))) &&
+ (mj < 19 || (mj == 19 && mi < 28) || modules.value))
{
prepend (
mj > 19 || mi >= 24 ?