From 1941d7d04af3d3c22144fdfefc29d39ec444ee8e Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 6 May 2021 21:49:18 +0300 Subject: project.boost: merge BootstrapToolchain and Toolchain In general, simplify Toolchain a bit. This is done in preparation for merging project.boost.toolchain, project.cmake.toolchain and project.toolchain. --- project/boost/directory.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'project/boost/directory.py') diff --git a/project/boost/directory.py b/project/boost/directory.py index 9b35194..162562c 100644 --- a/project/boost/directory.py +++ b/project/boost/directory.py @@ -6,7 +6,7 @@ import logging import os.path -from project.boost.toolchain import BootstrapToolchain +from project.boost.toolchain import Toolchain from project.utils import cd, run from project.os import on_windows @@ -33,8 +33,7 @@ class BoostDir: def bootstrap(self, params): with self._go(): - toolchain = BootstrapToolchain.detect(params.toolset) - run([self._bootstrap_path()] + self._bootstrap_args(toolchain)) + run([self._bootstrap_path()] + self._bootstrap_args(params.toolset)) def _b2(self, params): for b2_params in params.enum_b2_args(): @@ -52,7 +51,8 @@ class BoostDir: return f'bootstrap{ext}' @staticmethod - def _bootstrap_args(toolchain): + def _bootstrap_args(hint): + toolchain = Toolchain.detect(hint) if on_windows(): return toolchain.get_bootstrap_bat_args() return toolchain.get_bootstrap_sh_args() -- cgit v1.2.3