diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2021-01-19 11:58:32 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2021-01-19 11:58:32 +0200 |
| commit | bbf3c05a08279cfa08aacd5ff721e58c9dab58f4 (patch) | |
| tree | cce59ab0b59220f576cbb62bfc8433bd77670eee | |
| parent | d53786dfb6eda448b2091c5b8ab371701851efb0 (diff) | |
Adjust C++20 modules enablement for GCC
| -rw-r--r-- | libbuild2/cxx/init.cxx | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx index e2d7343..52e1ba2 100644 --- a/libbuild2/cxx/init.cxx +++ b/libbuild2/cxx/init.cxx @@ -331,21 +331,12 @@ namespace build2 } case compiler_type::gcc: { - // We now use extended/experimental module mapper support which - // is currently only available in our c++-modules-ex branch. - // But let's allow forcing it to plain c++-modules in case - // things got merged or the user feels adventurous. + // We use the module mapper support which is only available + // since GCC 11. And since we are not yet capable of supporting + // generated headers via the mapper, we require the user to + // explicitly request modules. // - // @@ 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) + if (mj >= 11 && l) { // Defines __cpp_modules=201907. @@ TMP: confirm. // |