From cb235003b81a8b6ac8204adcfd0481d621a44fc7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 8 Jan 2021 10:38:44 +0200
Subject: Handle bin.exe.prefix in addition to suffix

---
 bdep/buildfile   | 3 ++-
 bdep/utility.cxx | 4 ++--
 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
-- 
cgit v1.1