From 46fdd9eb995af4f704b283f0e6ce2c54d2e43d5c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 17 Aug 2016 14:40:59 +0200
Subject: If bpkg has exe.suffix, use it for the default build2 name

So if bpkg is called bpkg-stage, then we by default look for b-stage.
---
 bpkg/utility.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'bpkg/utility.cxx')

diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx
index 9bf1a5a..a26ab3c 100644
--- a/bpkg/utility.cxx
+++ b/bpkg/utility.cxx
@@ -199,7 +199,11 @@ namespace bpkg
          const strings& pvars,
          const strings& cvars)
   {
-    cstrings args {co.build ().string ().c_str ()};
+    const char* b (co.build_specified ()
+                   ? co.build ().string ().c_str ()
+                   : "b" BPKG_EXE_SUFFIX);
+
+    cstrings args {b};
 
     // Map verbosity level. If we are running quiet or at level 1,
     // then run build2 quiet. Otherwise, run it at the same level
-- 
cgit v1.1