smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buildEnv doesn't need to know about toolchains. 

Having access to the platform is enough.
This commit is contained in:
Matthieu Gautier 2018-05-28 19:50:36 +02:00
parent 41d23b6249
commit 211c0f9651
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kiwixbuild/buildenv.py
View File

@ -20,7 +20,6 @@ class PlatformNeutralEnv:
self.toolchain_dir, self.toolchain_dir,
self.log_dir): self.log_dir):
os.makedirs(d, exist_ok=True) os.makedirs(d, exist_ok=True)
self.toolchains = {}
self.detect_platform() self.detect_platform()
self.ninja_command = self._detect_ninja() self.ninja_command = self._detect_ninja()
if not self.ninja_command: if not self.ninja_command:
@ -115,16 +114,6 @@ class BuildEnv:
return 'lib64' return 'lib64'
return 'lib' 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): def _set_env(self, env, cross_compile_env, cross_compile_compiler, cross_compile_path):
if env is None: if env is None:
env = Defaultdict(str, os.environ) env = Defaultdict(str, os.environ)

4
kiwixbuild/platforms/base.py
View File

@ -47,10 +47,8 @@ class PlatformInfo(metaclass=_MetaPlatform):
return "{}_{}".format(self.build, 'static' if self.static else 'dyn') return "{}_{}".format(self.build, 'static' if self.static else 'dyn')
def setup_toolchains(self): def setup_toolchains(self):
self.toolchains = {}
for tlc_name in self.toolchain_names: for tlc_name in self.toolchain_names:
ToolchainClass = Toolchain.all_toolchains[tlc_name] ToolchainClass = Toolchain.all_toolchains[tlc_name]
self.toolchains[tlc_name] = ToolchainClass()
if ToolchainClass.Source is not None: if ToolchainClass.Source is not None:
add_plt_step(('source', tlc_name), ToolchainClass.Source) add_plt_step(('source', tlc_name), ToolchainClass.Source)
if ToolchainClass.Builder is not None: if ToolchainClass.Builder is not None:
@ -82,8 +80,6 @@ class PlatformInfo(metaclass=_MetaPlatform):
return crossfile return crossfile
def finalize_setup(self): 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.cross_config = self.get_cross_config()
self.buildEnv.meson_crossfile = None self.buildEnv.meson_crossfile = None
self.buildEnv.cmake_crossfile = None self.buildEnv.cmake_crossfile = None