From 04bfd3bf7a71197bdf5f697e323c70e98b857571 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 18 Sep 2019 15:55:22 +0200 Subject: Temporarily force c++17 if using GCC modules branch The use of 2a-isms in the standard library are breaking things on a regular basic. --- libbuild2/cxx/init.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx index 24d2cb9..5619397 100644 --- a/libbuild2/cxx/init.cxx +++ b/libbuild2/cxx/init.cxx @@ -296,13 +296,17 @@ namespace build2 // 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, etc. + // things got merged or the user feels adventurous. // if (mj >= 10 && ci.version.build.find (l ? "c++-modules" : "c++-modules-ex") != string::npos) { + // @@ TMP: currently there are some issues in the c++2a mode. + // + r.back () = "-std=c++17"; + // Currently defines __cpp_modules=201810 which is said to // correspond to p1103 (merged modules). // -- cgit v1.1