aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-06-09 17:55:06 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-06-09 17:55:06 +0200
commitb01fde82ba1e70af68ac78607daf421334f60cc7 (patch)
tree397b589fddd9874f62b47b1c1ecad53be1ad47de
parent1178ee892bf731d46a680e8fa48afa4807c4a531 (diff)
Only enable modules for GCC from the cxx-modules branch
-rw-r--r--build2/cxx/init.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx
index 89c7c11..32ba8b6 100644
--- a/build2/cxx/init.cxx
+++ b/build2/cxx/init.cxx
@@ -150,12 +150,13 @@ namespace build2
}
case compiler_id::gcc:
{
- // Enable starting with GCC 8.0.0.
+ // Enable starting with GCC 8.0.0 (currently the c++-modules
+ // branch).
//
- if (mj >= 8)
+ if (mj >= 8 &&
+ ci.version.build.find ("cxx-modules") != string::npos)
{
r.push_back ("-fmodules");
- //r.push_back ("-D__cpp_modules=201704"); // p0629r0
modules = true;
}
break;