aboutsummaryrefslogtreecommitdiff
path: root/build/prerequisite
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-12-12 13:46:07 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-12-12 13:46:07 +0200
commitad4120afce8c7bc4001fc0173a0ff7611ec0198d (patch)
treeebbc31d03feda96560df437247b63206489a1139 /build/prerequisite
parentdd4a389117812f0d3b45473d87214d67d0cb4a3a (diff)
Implement installation of prerequisite shared libraries
Diffstat (limited to 'build/prerequisite')
-rw-r--r--build/prerequisite7
1 files changed, 3 insertions, 4 deletions
diff --git a/build/prerequisite b/build/prerequisite
index 3022e44..c435fd3 100644
--- a/build/prerequisite
+++ b/build/prerequisite
@@ -30,8 +30,7 @@ namespace build
public:
typedef build::scope scope_type;
- mutable const std::string* const* proj; // Only *proj can be NULL, points
- // to project_name_pool.
+ mutable const std::string* proj; // Can be NULL, from project_name_pool.
target_key tk;
mutable scope_type* scope; // Can be NULL if tk.dir is absolute.
};
@@ -43,7 +42,7 @@ namespace build
// Can compare project name pointers since they are from project_name_pool.
//
- return *x.proj < *y.proj || (*x.proj == *y.proj && x.tk < y.tk);
+ return x.proj < y.proj || (x.proj == y.proj && x.tk < y.tk);
}
std::ostream&
@@ -83,7 +82,7 @@ namespace build
prerequisite_key
key () const
{
- return prerequisite_key {&proj, {&type, &dir, &name, &ext}, &scope};
+ return prerequisite_key {proj, {&type, &dir, &name, &ext}, &scope};
}
public: