aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-01-08 10:38:03 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-01-08 10:38:03 +0200
commita03f0d37605cfcd1206947c3d34d3142cbdd913a (patch)
tree96e8575a7bb294c86b44527058fe86f7ffad3d4c
parent0b3c28e2cbfe84f363a38cfb7f36f16aaad8e629 (diff)
Handle bin.exe.prefix in addition to suffix
-rw-r--r--bpkg/buildfile3
-rw-r--r--bpkg/utility.cxx2
2 files changed, 3 insertions, 2 deletions
diff --git a/bpkg/buildfile b/bpkg/buildfile
index a3ecd89..cb09ca9 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -82,7 +82,8 @@ for t: cxx{**.test...}
# Build options.
#
-obj{utility}: cxx.poptions += -DBPKG_EXE_SUFFIX='"'$bin.exe.suffix'"'
+obj{utility}: cxx.poptions += -DBPKG_EXE_PREFIX='"'$bin.exe.prefix'"' \
+-DBPKG_EXE_SUFFIX='"'$bin.exe.suffix'"'
# Pass the copyright notice extracted from the LICENSE file.
#
diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx
index df663c9..ef61870 100644
--- a/bpkg/utility.cxx
+++ b/bpkg/utility.cxx
@@ -311,6 +311,6 @@ namespace bpkg
{
return co.build_specified ()
? co.build ().string ().c_str ()
- : "b" BPKG_EXE_SUFFIX;
+ : BPKG_EXE_PREFIX "b" BPKG_EXE_SUFFIX;
}
}