aboutsummaryrefslogtreecommitdiff
path: root/build2
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-04-11 10:03:44 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-04-11 10:03:44 +0200
commited024f5c4e42bf1bc32d5721c83b990987b3aa74 (patch)
tree6bd775c4a69c604c150f696ff55ab2a8f1cf5301 /build2
parent9bd1a1619e282c585b3f202d84790f8811d1e4d6 (diff)
Sync up with latest C++ modules support in GCC
Diffstat (limited to 'build2')
-rw-r--r--build2/cc/compile-rule.cxx2
-rw-r--r--build2/cxx/init.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx
index 92ba32d..9e307b6 100644
--- a/build2/cc/compile-rule.cxx
+++ b/build2/cc/compile-rule.cxx
@@ -558,7 +558,7 @@ namespace build2
{
case compiler_type::gcc:
{
- e += mod ? "nms" : o;
+ e += mod ? "gcm" : o;
break;
}
case compiler_type::clang:
diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx
index 0326d22..7174121 100644
--- a/build2/cxx/init.cxx
+++ b/build2/cxx/init.cxx
@@ -196,8 +196,8 @@ namespace build2
if (mj >= 9 &&
ci.version.build.find ("c++-modules") != string::npos)
{
- // Currently defines __cpp_modules=201804 which is said to
- // correspond to p0713 ('module;' leading marker).
+ // Currently defines __cpp_modules=201810 which is said to
+ // correspond to p1103 (merged modules).
//
r.push_back ("-fmodules-ts");
modules = true;