Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Feb 3, 2023
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
991f0b4
fix: use correct OS check for settings_build when calling b2 or bcp exe
Pro Jan 30, 2023
60b7115
Apply suggestions from code review
Pro Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions recipes/boost/all/conanfile.py
View file
Open in desktop
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.exe" if self._settings_build.os == "Windows" else "b2"
Pro marked this conversation as resolved.
Show resolved Hide resolved

@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.exe" if self._settings_build.os == "Windows" else "bcp")
Pro marked this conversation as resolved.
Show resolved Hide resolved

@property
def _use_bcp(self):
Expand Down Expand Up @@ -869,7 +869,7 @@ def build(self):
with chdir(self, sources):
# To show the libraries *1
# self.run("%s --show-libraries" % b2_exe)
self.run(full_command)
self.run(full_command, run_environment=True)
Pro marked this conversation as resolved.
Show resolved Hide resolved

@property
def _b2_os(self):
Expand Down