diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-30 09:30:24 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-30 10:00:35 +0200 |
commit | 3dea3352e4cd414f01ae3d3b2215d6b0f1348d32 (patch) | |
tree | 899581ab605700450c5ca40e32e1ff37b3e9212d /build2/cli | |
parent | f89d2c16c1dad9b8d2f3b0e402a47e30521f5a69 (diff) |
Remove backwards-compatibility kludges
Diffstat (limited to 'build2/cli')
-rw-r--r-- | build2/cli/init.cxx | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx index f2a3e8c..b7a8434 100644 --- a/build2/cli/init.cxx +++ b/build2/cli/init.cxx @@ -251,20 +251,6 @@ namespace build2 if (!cast_false<bool> (bs["cxx.loaded"])) fail (loc) << "cxx module must be loaded before cli"; - // Register target types. - // - // Note that we do it even if the module is unconfigured. Failed that, - // writing a buildfile will be pretty hard (actually, a buildfile still - // needs to be prepared that the module itself won't be found and loaded - // by defining fallback target types). This will be a BC change. - // - { - auto& t (bs.target_types); - - t.insert<cli> (); - t.insert<cli_cxx> (); - } - // Load cli.config. // if (!cast_false<bool> (bs["cli.config.loaded"])) @@ -281,6 +267,15 @@ namespace build2 return false; } + // Register target types. + // + { + auto& t (bs.target_types); + + t.insert<cli> (); + t.insert<cli_cxx> (); + } + // Register our rules. // { |