aboutsummaryrefslogtreecommitdiff
path: root/build2
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-08-26 17:24:48 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-08-26 18:04:22 +0200
commit4a23b4cdf3102a8fef8ac6ebd8a884cd613c28ee (patch)
tree9fdd028cddde76ea4037c55fd7430950a0d05dd5 /build2
parent4177d70e63893d0a2c76beb9166ebbf79c4697a0 (diff)
Implement auto-import of development build2 build
Diffstat (limited to 'build2')
-rw-r--r--build2/b.cxx1
-rw-r--r--build2/cc/link-rule.cxx3
2 files changed, 4 insertions, 0 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index 49a4d34..27a9cd0 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -609,6 +609,7 @@ main (int argc, char* argv[])
trace << "work: " << work;
trace << "home: " << home;
trace << "path: " << (p ? *p : "<NULL>");
+ trace << "type: " << (build_installed ? "installed" : "development");
trace << "jobs: " << jobs;
}
diff --git a/build2/cc/link-rule.cxx b/build2/cc/link-rule.cxx
index fa6d5e4..ce5fce9 100644
--- a/build2/cc/link-rule.cxx
+++ b/build2/cc/link-rule.cxx
@@ -1821,7 +1821,10 @@ namespace build2
if (lookup l = p.prerequisite.vars[var_fi])
{
if (cast<bool> (l) != for_install)
+ {
+ l5 ([&]{trace << "excluding " << *pt << " due to for_install";});
pt = nullptr;
+ }
}
}
}