aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/project/boost/directory.py
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--project/boost/directory.py18
1 files changed, 13 insertions, 5 deletions
diff --git a/project/boost/directory.py b/project/boost/directory.py
index 17448b6..9b35194 100644
--- a/project/boost/directory.py
+++ b/project/boost/directory.py
@@ -6,6 +6,7 @@
import logging
import os.path
+from project.boost.toolchain import BootstrapToolchain
from project.utils import cd, run
from project.os import on_windows
@@ -21,18 +22,19 @@ class BoostDir:
def build(self, params):
with self._go():
- self._bootstrap_if_required()
+ self._bootstrap_if_required(params)
self._b2(params)
- def _bootstrap_if_required(self):
+ def _bootstrap_if_required(self, params):
if os.path.isfile(self._b2_path()):
logging.info('Not going to bootstrap, b2 is already there')
return
- self.bootstrap()
+ self.bootstrap(params)
- def bootstrap(self):
+ def bootstrap(self, params):
with self._go():
- run(self._bootstrap_path())
+ toolchain = BootstrapToolchain.detect(params.toolset)
+ run([self._bootstrap_path()] + self._bootstrap_args(toolchain))
def _b2(self, params):
for b2_params in params.enum_b2_args():
@@ -50,6 +52,12 @@ class BoostDir:
return f'bootstrap{ext}'
@staticmethod
+ def _bootstrap_args(toolchain):
+ if on_windows():
+ return toolchain.get_bootstrap_bat_args()
+ return toolchain.get_bootstrap_sh_args()
+
+ @staticmethod
def _b2_path():
return os.path.join('.', BoostDir._b2_name())