aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cxx/init.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-11-26 07:32:31 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-11-30 13:03:07 +0200
commitc0303569afe979f3965228835ac902dce2e940c2 (patch)
treebb4796b61d74fae286d0a8d328968a503c2bade6 /libbuild2/cxx/init.cxx
parent7801dc763e50fcecc8a370f78fe33b5e86e1c8a3 (diff)
Start adapting module mapper to latest GCC protocol
Diffstat (limited to 'libbuild2/cxx/init.cxx')
-rw-r--r--libbuild2/cxx/init.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx
index 8f91b19..21acedc 100644
--- a/libbuild2/cxx/init.cxx
+++ b/libbuild2/cxx/init.cxx
@@ -325,13 +325,18 @@ namespace build2
// But let's allow forcing it to plain c++-modules in case
// things got merged or the user feels adventurous.
//
- if (mj >= 10 &&
+ // @@ TMP: revise: for now must be forced (also in modules
+ // tests).
+ //
+ if (mj >= 11 &&
+ l &&
+ ci.version.build.find ("c++-modules")
+ /*
ci.version.build.find (l
? "c++-modules"
- : "c++-modules-ex") != string::npos)
+ : "c++-modules-ex")*/ != string::npos)
{
- // Currently defines __cpp_modules=201810 which is said to
- // correspond to p1103 (merged modules).
+ // Defines __cpp_modules=201907. @@ TMP: confirm.
//
prepend ("-fmodules-ts");
modules = true;