diff options
author | Oliver Reiche <oliver.reiche@huawei.com> | 2022-05-04 16:24:28 +0200 |
---|---|---|
committer | Oliver Reiche <oliver.reiche@huawei.com> | 2022-05-04 16:24:28 +0200 |
commit | 5aa5cb7941301205b4285163652178b17888d098 (patch) | |
tree | 44de5c4da8463577828df797682250d68c9ed43c /src/buildtool/build_engine/target_map/utils.cpp | |
parent | f2537a593998ae466d2317e5a70210d3d51b2729 (diff) | |
download | justbuild-5aa5cb7941301205b4285163652178b17888d098.tar.gz |
install: normalize dir paths
Diffstat (limited to 'src/buildtool/build_engine/target_map/utils.cpp')
-rw-r--r-- | src/buildtool/build_engine/target_map/utils.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/buildtool/build_engine/target_map/utils.cpp b/src/buildtool/build_engine/target_map/utils.cpp index 5d80b4c7..bff5d1b8 100644 --- a/src/buildtool/build_engine/target_map/utils.cpp +++ b/src/buildtool/build_engine/target_map/utils.cpp @@ -73,9 +73,8 @@ auto BuildMaps::Target::Utils::keys_expr(const ExpressionPtr& map) return ExpressionPtr{result}; } -namespace { - -auto normal(std::filesystem::path const& p) -> std::filesystem::path { +auto BuildMaps::Target::Utils::normal(std::filesystem::path const& p) + -> std::filesystem::path { auto n = p.lexically_normal(); if (not n.has_filename()) { return n.parent_path(); @@ -83,8 +82,6 @@ auto normal(std::filesystem::path const& p) -> std::filesystem::path { return n; } -} // namespace - auto BuildMaps::Target::Utils::tree_conflict(const ExpressionPtr& map) -> std::optional<std::string> { std::vector<std::filesystem::path> trees{}; |