Skip to content

Commit

Permalink
(conan-io#15550) fix: use correct OS check for settings_build when ca…
Browse files Browse the repository at this point in the history
…lling b2 or bcp exe

* fix: use correct OS check for settings_build when calling b2 or bcp exe

* Apply suggestions from code review

fix: apply suggestions

Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>

---------

Co-authored-by: SpaceIm <30052553+SpaceIm@users.noreply.github.com>
  • Loading branch information
2 people authored and sabelka committed Feb 12, 2023
1 parent d32b103 commit bb0e808
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions recipes/boost/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -774,12 +774,12 @@ def _clean(self):

@property
def _b2_exe(self):
return "b2.exe" if self._settings_build == "Windows" else "b2"
return "b2"

@property
def _bcp_exe(self):
folder = os.path.join(self.source_folder, "dist", "bin")
return os.path.join(folder, "bcp.exe" if self._settings_build == "Windows" else "bcp")
return os.path.join(folder, "bcp")

@property
def _use_bcp(self):
Expand Down

0 comments on commit bb0e808

Please sign in to comment.