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/search.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/search.cxx')
-rw-r--r-- | build/search.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/search.cxx b/build/search.cxx index dfb603d..32302d6 100644 --- a/build/search.cxx +++ b/build/search.cxx @@ -33,7 +33,7 @@ namespace build d = *tk.dir; // Already normalized. else { - d = pk.scope->path (); + d = pk.scope->out_path (); if (!tk.dir->empty ()) { @@ -148,7 +148,7 @@ namespace build d = *tk.dir; // Already normalized. else { - d = pk.scope->path (); + d = pk.scope->out_path (); if (!tk.dir->empty ()) { |