aboutsummaryrefslogtreecommitdiff
path: root/build2/dist/operation.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-07-30 13:34:41 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-07-30 17:24:28 +0200
commitbd9b1fa4b6c20b7eedf7f96d9b9aae6ff5edfbfb (patch)
tree81bf71d660b88d668e9e7677cb8006a6270205a9 /build2/dist/operation.cxx
parent988fd0eec5d88bf6534fb1f645777350c20d4723 (diff)
Construct paths to use canonical directory separators
Hardcoding separators as in "build/root.build" is now a big no-no.
Diffstat (limited to 'build2/dist/operation.cxx')
-rw-r--r--build2/dist/operation.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx
index c87f0e7..0ab9241 100644
--- a/build2/dist/operation.cxx
+++ b/build2/dist/operation.cxx
@@ -140,9 +140,9 @@ namespace build2
// ignored on the next step if the user explicitly marked them
// nodist.
//
- auto add_adhoc = [&trace] (scope& rs, const char* f)
+ auto add_adhoc = [&trace] (scope& rs, const path& f)
{
- path p (rs.src_path () / path (f));
+ path p (rs.src_path () / f);
if (file_exists (p))
{
dir_path d (p.directory ());
@@ -163,7 +163,7 @@ namespace build2
}
};
- add_adhoc (*rs, "build/export.build");
+ add_adhoc (*rs, export_file);
// The same for subprojects that have been loaded.
//
@@ -181,7 +181,7 @@ namespace build2
if (!nrs.src_path ().sub (src_root)) // Not a strong amalgamation.
continue;
- add_adhoc (nrs, "build/export.build");
+ add_adhoc (nrs, export_file);
}
}