diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-27 08:29:52 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-27 08:29:52 +0200 |
| commit | c2001eb367b9b82e26689cad6f1f74f46c72b904 (patch) | |
| tree | db2ee46fc11989d85201ccebaf44f51b978fb313 /build2/bin | |
| parent | 530e19cc8f53f066039967c41bb432111ce98626 (diff) | |
Pass target to prerequisite search
Diffstat (limited to 'build2/bin')
| -rw-r--r-- | build2/bin/rule.cxx | 4 | ||||
| -rw-r--r-- | build2/bin/target.cxx | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/build2/bin/rule.cxx b/build2/bin/rule.cxx index 3ea8e75..fd1526e 100644 --- a/build2/bin/rule.cxx +++ b/build2/bin/rule.cxx @@ -53,8 +53,8 @@ namespace build2 fail << "unknown library type: " << type << info << "'static', 'shared', or 'both' expected"; - t.a = a ? &search<liba> (t.dir, t.out, t.name) : nullptr; - t.s = s ? &search<libs> (t.dir, t.out, t.name) : nullptr; + t.a = a ? &search<liba> (t, t.dir, t.out, t.name) : nullptr; + t.s = s ? &search<libs> (t, t.dir, t.out, t.name) : nullptr; match_result mr (true); diff --git a/build2/bin/target.cxx b/build2/bin/target.cxx index 2be5686..dc691d6 100644 --- a/build2/bin/target.cxx +++ b/build2/bin/target.cxx @@ -43,7 +43,7 @@ namespace build2 &target_extension_var<ext_var, nullptr>, &target_pattern_var<ext_var, nullptr>, nullptr, - &search_target, // Note: not _file(); don't look for an existing file. + &target_search, // Note: not _file(); don't look for an existing file. false }; @@ -55,7 +55,7 @@ namespace build2 &target_extension_var<ext_var, nullptr>, &target_pattern_var<ext_var, nullptr>, nullptr, - &search_target, // Note: not _file(); don't look for an existing file. + &target_search, // Note: not _file(); don't look for an existing file. false }; @@ -67,7 +67,7 @@ namespace build2 &target_extension_var<ext_var, nullptr>, &target_pattern_var<ext_var, nullptr>, nullptr, - &search_target, // Note: not _file(); don't look for an existing file. + &target_search, // Note: not _file(); don't look for an existing file. false }; @@ -107,7 +107,7 @@ namespace build2 nullptr, nullptr, nullptr, - &search_target, + &target_search, false }; @@ -145,7 +145,7 @@ namespace build2 &target_extension_var<ext_var, nullptr>, &target_pattern_var<ext_var, nullptr>, nullptr, - &search_file, + &file_search, false }; @@ -157,7 +157,7 @@ namespace build2 &target_extension_var<ext_var, nullptr>, &target_pattern_var<ext_var, nullptr>, nullptr, - &search_file, + &file_search, false }; @@ -206,7 +206,7 @@ namespace build2 nullptr, nullptr, nullptr, - &search_target, + &target_search, false }; @@ -220,7 +220,7 @@ namespace build2 &target_extension_var<ext_var, nullptr>, &target_pattern_var<ext_var, nullptr>, nullptr, - &search_file, + &file_search, false }; } |