aboutsummaryrefslogtreecommitdiff
path: root/build2/context.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-07-08 14:05:28 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-07-08 14:11:55 +0200
commit6205a2d9eb7db0a25959ae34dc5406f228da92a5 (patch)
tree0214d042250f290a852267c3552efc54a8b76629 /build2/context.cxx
parent9bd06458e869ab0b41db2d3d7b190d6183ff8547 (diff)
Implement limited rpath emulation for Windows
Diffstat (limited to 'build2/context.cxx')
-rw-r--r--build2/context.cxx26
1 files changed, 13 insertions, 13 deletions
diff --git a/build2/context.cxx b/build2/context.cxx
index 59eb912..5530ce3 100644
--- a/build2/context.cxx
+++ b/build2/context.cxx
@@ -326,10 +326,10 @@ namespace build2
}
fs_status<mkdir_status>
- mkdir (const dir_path& d)
+ mkdir (const dir_path& d, uint16_t v)
{
- // We don't want to print the command if the directory already
- // exists. This makes the below code a bit ugly.
+ // We don't want to print the command if the directory already exists.
+ // This makes the below code a bit ugly.
//
mkdir_status ms;
@@ -339,7 +339,7 @@ namespace build2
}
catch (const system_error& e)
{
- if (verb)
+ if (verb >= v)
text << "mkdir " << d;
error << "unable to create directory " << d << ": " << e.what ();
@@ -348,7 +348,7 @@ namespace build2
if (ms == mkdir_status::success)
{
- if (verb)
+ if (verb >= v)
text << "mkdir " << d;
}
@@ -356,10 +356,10 @@ namespace build2
}
fs_status<mkdir_status>
- mkdir_p (const dir_path& d)
+ mkdir_p (const dir_path& d, uint16_t v)
{
- // We don't want to print the command if the directory already
- // exists. This makes the below code a bit ugly.
+ // We don't want to print the command if the directory already exists.
+ // This makes the below code a bit ugly.
//
mkdir_status ms;
@@ -369,7 +369,7 @@ namespace build2
}
catch (const system_error& e)
{
- if (verb)
+ if (verb >= v)
text << "mkdir -p " << d;
error << "unable to create directory " << d << ": " << e.what ();
@@ -378,7 +378,7 @@ namespace build2
if (ms == mkdir_status::success)
{
- if (verb)
+ if (verb >= v)
text << "mkdir -p " << d;
}
@@ -386,7 +386,7 @@ namespace build2
}
fs_status<butl::rmdir_status>
- rmdir_r (const dir_path& d)
+ rmdir_r (const dir_path& d, bool dir, uint16_t v)
{
using namespace butl;
@@ -396,12 +396,12 @@ namespace build2
if (!dir_exists (d))
return rmdir_status::not_exist;
- if (verb)
+ if (verb >= v)
text << "rmdir -r " << d;
try
{
- butl::rmdir_r (d);
+ butl::rmdir_r (d, dir);
}
catch (const system_error& e)
{