aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-01-08 10:38:44 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-01-08 10:38:44 +0200
commitcb235003b81a8b6ac8204adcfd0481d621a44fc7 (patch)
treec7daafe0c7ae5953890021934f89d314ac13dd44
parent876387aca1c278872a349b637d0e858dfdba2c76 (diff)
Handle bin.exe.prefix in addition to suffix
-rw-r--r--bdep/buildfile3
-rw-r--r--bdep/utility.cxx4
2 files changed, 4 insertions, 3 deletions
diff --git a/bdep/buildfile b/bdep/buildfile
index 605ebcd..cb701e8 100644
--- a/bdep/buildfile
+++ b/bdep/buildfile
@@ -73,7 +73,8 @@ for t: cxx{**.test...}
# Build options.
#
-obj{utility}: cxx.poptions += -DBDEP_EXE_SUFFIX='"'$bin.exe.suffix'"'
+obj{utility}: cxx.poptions += -DBDEP_EXE_PREFIX='"'$bin.exe.prefix'"' \
+-DBDEP_EXE_SUFFIX='"'$bin.exe.suffix'"'
# Pass the copyright notice extracted from the LICENSE file.
#
diff --git a/bdep/utility.cxx b/bdep/utility.cxx
index 703520e..6cab4fa 100644
--- a/bdep/utility.cxx
+++ b/bdep/utility.cxx
@@ -267,7 +267,7 @@ namespace bdep
{
return co.bpkg_specified ()
? co.bpkg ().string ().c_str ()
- : "bpkg" BDEP_EXE_SUFFIX;
+ : BDEP_EXE_PREFIX "bpkg" BDEP_EXE_SUFFIX;
}
const char*
@@ -275,7 +275,7 @@ namespace bdep
{
return co.build_specified ()
? co.build ().string ().c_str ()
- : "b" BDEP_EXE_SUFFIX;
+ : BDEP_EXE_PREFIX "b" BDEP_EXE_SUFFIX;
}
void