diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2015-08-31 13:45:57 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-08-31 13:45:57 +0200 |
| commit | 5974cab56148a18628bfb423189e016ade2d40f9 (patch) | |
| tree | 472a7966d0e1c5725f0736c73812cbdeaab827dc /build/cxx/compile.cxx | |
| parent | 2a9d673f298b623db061ee85d397563d644c8268 (diff) | |
Rework scoping logic
Now the src directory is entered into the scope map and points to
the same scope as out. This means that targets that are in src,
not out (e.g., source files) will "see" rules, variables, etc.
This becomes important when we try, for example, to install a
source file (say, a header) from src: we need the rule as well
as the install.* variables.
Diffstat (limited to 'build/cxx/compile.cxx')
| -rw-r--r-- | build/cxx/compile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/cxx/compile.cxx b/build/cxx/compile.cxx index 514c57a..f9351f2 100644 --- a/build/cxx/compile.cxx +++ b/build/cxx/compile.cxx @@ -88,7 +88,7 @@ namespace build const dir_path* amlg ( a.operation () != clean_id ? nullptr - : &t.strong_scope ().path ()); + : &t.strong_scope ().out_path ()); link::search_paths_cache lib_paths; // Extract lazily. @@ -213,7 +213,7 @@ namespace build return; const dir_path& out_base (t.dir); - const dir_path& out_root (rs->path ()); + const dir_path& out_root (rs->out_path ()); if (auto l = t[var]) { |