aboutsummaryrefslogtreecommitdiff
path: root/build2/cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-06-12 08:33:28 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-06-12 08:33:28 +0200
commitce177a4b12f2fef490683e53ccc9ee8f4d3e0bd6 (patch)
tree34aae6ca8abb182fdf20a59b6ab3a08ef1e1db55 /build2/cxx
parentb01fde82ba1e70af68ac78607daf421334f60cc7 (diff)
Add workaround for Clang module import during preprocessing
Diffstat (limited to 'build2/cxx')
-rw-r--r--build2/cxx/init.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx
index 32ba8b6..8c4249c 100644
--- a/build2/cxx/init.cxx
+++ b/build2/cxx/init.cxx
@@ -142,8 +142,8 @@ namespace build2
//
if (mj > 19 || (mj == 19 && mi >= 11))
{
- r.push_back ("/experimental:module");
r.push_back ("/D__cpp_modules=201703"); // n4647
+ r.push_back ("/experimental:module");
modules = true;
}
break;
@@ -168,10 +168,12 @@ namespace build2
// Note that we are using Apple to vanilla Clang version re-
// map from above so may need to update things there as well.
//
+ // Note: see Clang modules support hack in cc::compile.
+ //
if (mj >= 5)
{
- r.push_back ("-fmodules-ts");
r.push_back ("-D__cpp_modules=201704"); // p0629r0
+ r.push_back ("-fmodules-ts");
modules = true;
}
break;