Skip to content

Commit

Permalink
- some sanity checks to avoid str(None) which is "None"
Browse files Browse the repository at this point in the history
Signed-off-by: SSE4 <[email protected]>
  • Loading branch information
SSE4 committed Mar 12, 2020
1 parent 9c8fd83 commit c11d9e6
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 @@ -687,9 +687,9 @@ def _cxx(self):
compiler_version = str(self.settings.compiler.version)
major = compiler_version.split(".")[0]
if self.settings.compiler == "gcc":
return tools.which("g++-%s" % compiler_version) or tools.which("g++-%s" % major) or tools.which("gcc")
return tools.which("g++-%s" % compiler_version) or tools.which("g++-%s" % major) or tools.which("g++") or ""
if self.settings.compiler == "clang":
return tools.which("clang++-%s" % compiler_version) or tools.which("clang++-%s" % major) or tools.which("gcc")
return tools.which("clang++-%s" % compiler_version) or tools.which("clang++-%s" % major) or tools.which("clang++") or ""
return ""

def _create_user_config_jam(self, folder):
Expand Down

0 comments on commit c11d9e6

Please sign in to comment.