diff options
| author |  David Leverton <levertond@googlemail.com>
| 2013-03-24 19:37:45 +0000 |
|---|---|---|
| committer | David Leverton <levertond@googlemail.com>
| 2013-03-24 19:37:45 +0000 |
| commit | a8f004003a42125f8e60199906f45ed1038e1a71 (patch) | |
| tree | cff79cffd8d00a1c76affee8bcb7d34df41dda3c | |
| parent | 97a8c5f8b2e000f8f5997e09d5463bea66ea9ee5 (diff) | |
| download | paludis-a8f004003a42125f8e60199906f45ed1038e1a71.tar.gz paludis-a8f004003a42125f8e60199906f45ed1038e1a71.tar.xz | |
Load make.globals before profile
| -rw-r--r-- | paludis/environments/portage/portage_environment.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc index 32aa3d5..7449f8c 100644 --- a/paludis/environments/portage/portage_environment.cc +++ b/paludis/environments/portage/portage_environment.cc @@ -251,13 +251,15 @@ PortageEnvironment::PortageEnvironment(const std::string & s) : _imp->vars = std::make_shared<KeyValueConfigFile>(FSPath("/dev/null"), KeyValueConfigFileOptions(), &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation); - _load_profile((_imp->conf_dir / "make.profile").realpath()); if ((FSPath(DATADIR) / "portage" / "config" / "make.globals").stat().exists()) _imp->vars = std::make_shared<KeyValueConfigFile>(FSPath(DATADIR) / "portage" / "config" / "make.globals", KeyValueConfigFileOptions() + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line, std::bind(&predefined, _imp->vars, std::placeholders::_1, std::placeholders::_2), &do_incremental); + + _load_profile((_imp->conf_dir / "make.profile").realpath()); + if ((_imp->conf_dir / "make.conf").stat().exists()) _imp->vars = std::make_shared<KeyValueConfigFile>(_imp->conf_dir / "make.conf", KeyValueConfigFileOptions() + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line, |