From a03f0d37605cfcd1206947c3d34d3142cbdd913a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 8 Jan 2021 10:38:03 +0200 Subject: Handle bin.exe.prefix in addition to suffix --- bpkg/buildfile | 3 ++- bpkg/utility.cxx | 2 +- 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; } } -- cgit v1.1