aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build2/b.cxx4
-rw-r--r--build2/c/init.cxx6
-rw-r--r--build2/cc/init28
-rw-r--r--build2/cc/init.cxx44
-rw-r--r--build2/cc/module.cxx17
-rw-r--r--build2/cxx/init.cxx6
6 files changed, 53 insertions, 52 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index cd69342..61d120a 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -228,8 +228,8 @@ main (int argc, char* argv[])
bm["bin.rc.config"] = mf {nullptr, &bin::rc_config_init};
bm["bin.rc"] = mf {nullptr, &bin::rc_init};
- bm["cc.vars"] = mf {nullptr, &cc::vars_init};
- bm["cc.config"] = mf {nullptr, &cc::config_init};
+ bm["cc.core.vars"] = mf {nullptr, &cc::core_vars_init};
+ bm["cc.core.config"] = mf {nullptr, &cc::core_config_init};
bm["cc.core"] = mf {nullptr, &cc::core_init};
bm["cc"] = mf {nullptr, &cc::init};
diff --git a/build2/c/init.cxx b/build2/c/init.cxx
index 88f0b2b..fa17227 100644
--- a/build2/c/init.cxx
+++ b/build2/c/init.cxx
@@ -103,10 +103,10 @@ namespace build2
if (first)
{
- // Load cc.vars so that we can cache all the cc.* variables.
+ // Load cc.core.vars so that we can cache all the cc.* variables.
//
- if (!cast_false<bool> (b["cc.vars.loaded"]))
- load_module ("cc.vars", r, b, loc);
+ if (!cast_false<bool> (b["cc.core.vars.loaded"]))
+ load_module ("cc.core.vars", r, b, loc);
// Enter all the variables and initialize the module data.
//
diff --git a/build2/cc/init b/build2/cc/init
index d8ebd0e..3e84f51 100644
--- a/build2/cc/init
+++ b/build2/cc/init
@@ -15,22 +15,22 @@ namespace build2
namespace cc
{
bool
- vars_init (scope&,
- scope&,
- const location&,
- unique_ptr<module_base>&,
- bool,
- bool,
- const variable_map&);
+ core_vars_init (scope&,
+ scope&,
+ const location&,
+ unique_ptr<module_base>&,
+ bool,
+ bool,
+ const variable_map&);
bool
- config_init (scope&,
- scope&,
- const location&,
- unique_ptr<module_base>&,
- bool,
- bool,
- const variable_map&);
+ core_config_init (scope&,
+ scope&,
+ const location&,
+ unique_ptr<module_base>&,
+ bool,
+ bool,
+ const variable_map&);
bool
core_init (scope&,
diff --git a/build2/cc/init.cxx b/build2/cc/init.cxx
index 5f8e2fb..63341d5 100644
--- a/build2/cc/init.cxx
+++ b/build2/cc/init.cxx
@@ -22,15 +22,15 @@ namespace build2
namespace cc
{
bool
- vars_init (scope& r,
- scope&,
- const location&,
- unique_ptr<module_base>&,
- bool first,
- bool,
- const variable_map&)
+ core_vars_init (scope& r,
+ scope&,
+ const location&,
+ unique_ptr<module_base>&,
+ bool first,
+ bool,
+ const variable_map&)
{
- tracer trace ("cc::vars_init");
+ tracer trace ("cc::core_vars_init");
l5 ([&]{trace << "for " << r.out_path ();});
assert (first);
@@ -64,23 +64,23 @@ namespace build2
}
bool
- config_init (scope& r,
- scope& b,
- const location& loc,
- unique_ptr<module_base>&,
- bool first,
- bool,
- const variable_map& hints)
+ core_config_init (scope& r,
+ scope& b,
+ const location& loc,
+ unique_ptr<module_base>&,
+ bool first,
+ bool,
+ const variable_map& hints)
{
- tracer trace ("cc::config_init");
+ tracer trace ("cc::core_config_init");
l5 ([&]{trace << "for " << b.out_path ();});
- // Load cc.vars.
+ // Load cc.core.vars.
//
if (first)
{
- if (!cast_false<bool> (b["cc.vars.loaded"]))
- load_module ("cc.vars", r, b, loc);
+ if (!cast_false<bool> (b["cc.core.vars.loaded"]))
+ load_module ("cc.core.vars", r, b, loc);
}
// Configure.
@@ -236,10 +236,10 @@ namespace build2
tracer trace ("cc::core_init");
l5 ([&]{trace << "for " << b.out_path ();});
- // Load cc.config.
+ // Load cc.core.config.
//
- if (!cast_false<bool> (b["cc.config.loaded"]))
- load_module ("cc.config", r, b, loc, false, hints);
+ if (!cast_false<bool> (b["cc.core.config.loaded"]))
+ load_module ("cc.core.config", r, b, loc, false, hints);
// Load the bin module.
//
diff --git a/build2/cc/module.cxx b/build2/cc/module.cxx
index 4926fac..76b2b56 100644
--- a/build2/cc/module.cxx
+++ b/build2/cc/module.cxx
@@ -35,7 +35,7 @@ namespace build2
{
tracer trace (x, "config_init");
- bool cc_loaded (cast_false<bool> (b["cc.config.loaded"]));
+ bool cc_loaded (cast_false<bool> (b["cc.core.config.loaded"]));
// Configure.
//
@@ -65,8 +65,8 @@ namespace build2
if (p.first == nullptr)
{
- // If someone already loaded cc.config then use its toolchain id
- // and (optional) pattern to guess an appropriate default (e.g.,
+ // If someone already loaded cc.core.config then use its toolchain
+ // id and (optional) pattern to guess an appropriate default (e.g.,
// for {gcc, *-4.9} we will get g++-4.9).
//
path d (cc_loaded
@@ -210,12 +210,12 @@ namespace build2
b.assign (x_libs) += cast_null<strings> (
config::optional (r, config_x_libs));
- // Load cc.config.
+ // Load cc.core.config.
//
if (!cc_loaded)
{
// Prepare configuration hints. They are only used on the first load
- // of cc.config so we only populate them on our first load.
+ // of cc.core.config so we only populate them on our first load.
//
variable_map h;
if (first)
@@ -230,12 +230,13 @@ namespace build2
h.assign ("config.bin.pattern") = move (ci.bin_pattern);
}
- load_module ("cc.config", r, b, loc, false, h);
+ load_module ("cc.core.config", r, b, loc, false, h);
}
else if (first)
{
- // If cc.config is already loaded, verify its configuration matched
- // ours since it could have been loaded by another c-family module.
+ // If cc.core.config is already loaded, verify its configuration
+ // matched ours since it could have been loaded by another c-family
+ // module.
//
auto check = [&r, &loc, this](const char* cvar,
const variable& xvar,
diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx
index 7d64975..71b4a5b 100644
--- a/build2/cxx/init.cxx
+++ b/build2/cxx/init.cxx
@@ -103,10 +103,10 @@ namespace build2
if (first)
{
- // Load cc.vars so that we can cache all the cc.* variables.
+ // Load cc.core.vars so that we can cache all the cc.* variables.
//
- if (!cast_false<bool> (b["cc.vars.loaded"]))
- load_module ("cc.vars", r, b, loc);
+ if (!cast_false<bool> (b["cc.core.vars.loaded"]))
+ load_module ("cc.core.vars", r, b, loc);
// Enter all the variables and initialize the module data.
//