diff --git a/kiwixbuild/buildenv.py b/kiwixbuild/buildenv.py index 816ca04..186affd 100644 --- a/kiwixbuild/buildenv.py +++ b/kiwixbuild/buildenv.py @@ -20,7 +20,6 @@ class PlatformNeutralEnv: self.toolchain_dir, self.log_dir): os.makedirs(d, exist_ok=True) - self.toolchains = {} self.detect_platform() self.ninja_command = self._detect_ninja() if not self.ninja_command: @@ -115,16 +114,6 @@ class BuildEnv: return 'lib64' return 'lib' - @property - def configure_option(self): - configure_options = [tlc.configure_option for tlc in self.toolchains] - return " ".join(configure_options) - - @property - def cmake_option(self): - cmake_options = [tlc.cmake_option for tlc in self.toolchains] - return " ".join(cmake_options) - def _set_env(self, env, cross_compile_env, cross_compile_compiler, cross_compile_path): if env is None: env = Defaultdict(str, os.environ) diff --git a/kiwixbuild/platforms/base.py b/kiwixbuild/platforms/base.py index 4c2b012..242ebf1 100644 --- a/kiwixbuild/platforms/base.py +++ b/kiwixbuild/platforms/base.py @@ -47,10 +47,8 @@ class PlatformInfo(metaclass=_MetaPlatform): return "{}_{}".format(self.build, 'static' if self.static else 'dyn') def setup_toolchains(self): - self.toolchains = {} for tlc_name in self.toolchain_names: ToolchainClass = Toolchain.all_toolchains[tlc_name] - self.toolchains[tlc_name] = ToolchainClass() if ToolchainClass.Source is not None: add_plt_step(('source', tlc_name), ToolchainClass.Source) if ToolchainClass.Builder is not None: @@ -82,8 +80,6 @@ class PlatformInfo(metaclass=_MetaPlatform): return crossfile def finalize_setup(self): - self.buildEnv.toolchains = [ - self.toolchains[tlc_name] for tlc_name in self.toolchain_names] self.buildEnv.cross_config = self.get_cross_config() self.buildEnv.meson_crossfile = None self.buildEnv.cmake_crossfile = None