From c0303569afe979f3965228835ac902dce2e940c2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 26 Nov 2020 07:32:31 +0200
Subject: Start adapting module mapper to latest GCC protocol

---
 libbuild2/cxx/init.cxx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'libbuild2/cxx/init.cxx')

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;
-- 
cgit v1.1