diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-26 01:15:55 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-27 23:23:07 +0530 |
| commit | f751ee4d0efb670132d747a4f56485ce843a7679 (patch) | |
| tree | 3d381058c20d15cd9b55633d7f9ab4971b1568f6 | |
| parent | 2803becf86ac54d45e6f7f3c23cf57905ed905d7 (diff) | |
cerbero: Use built glib whenever prefix is executable
If the prefix is executable, we do not need to build glib-tools
separately for use during the build process. We can just use the glib
binaries and scripts provided by the glib built by us.
| -rw-r--r-- | cerbero/bootstrap/build_tools.py | 4 | ||||
| -rw-r--r-- | cerbero/config.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cerbero/bootstrap/build_tools.py b/cerbero/bootstrap/build_tools.py index 0bb5141c..6499e6b3 100644 --- a/cerbero/bootstrap/build_tools.py +++ b/cerbero/bootstrap/build_tools.py @@ -68,8 +68,8 @@ class BuildTools (BootstrapperBase): if self.config.distro_version in [DistroVersion.UBUNTU_LUCID, DistroVersion.UBUNTU_NATTY]: self.BUILD_TOOLS.append('glib-tools') - if self.config.platform != Platform.LINUX and\ - self.config.cross_compiling(): + if self.config.platform != Platform.LINUX and not \ + self.config.prefix_is_executable(): # For glib-mkenums and glib-genmarshal self.BUILD_TOOLS.append('glib-tools') self.BUILD_TOOLS += self.config.extra_build_tools diff --git a/cerbero/config.py b/cerbero/config.py index 31dc87bf..3cfd2b63 100644 --- a/cerbero/config.py +++ b/cerbero/config.py @@ -250,7 +250,7 @@ class Config (object): ldflags += os.environ.get('LDFLAGS', '') path = os.environ.get('PATH', '') - if bindir not in path and not self.cross_compiling(): + if bindir not in path and self.prefix_is_executable(): path = self._join_path(bindir, path) path = self._join_path( os.path.join(self.build_tools_prefix, 'bin'), path) |