diff options
| author | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-04-07 07:55:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-07 07:55:36 +0000 |
| commit | ef87d11dcdcd2685e6dd5fa994e155a0801a630b (patch) | |
| tree | 4bd887dd6c6b837036dda6ab90c5ebf623d3fa41 /mesonbuild/msetup.py | |
| parent | a2c3ba474a5ad47539b5ecf7218db272fab8359f (diff) | |
| parent | 91b2475e30d7659dad24eb35b47e4d098c716792 (diff) | |
| download | meson-ef87d11dcdcd2685e6dd5fa994e155a0801a630b.zip meson-ef87d11dcdcd2685e6dd5fa994e155a0801a630b.tar.gz meson-ef87d11dcdcd2685e6dd5fa994e155a0801a630b.tar.bz2 | |
Merge pull request #4931 from dcbaker/pkg-config-builtin
dependencies: Add command line option for pkg_config_path
Diffstat (limited to 'mesonbuild/msetup.py')
| -rw-r--r-- | mesonbuild/msetup.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mesonbuild/msetup.py b/mesonbuild/msetup.py index 6e8ca83..ef0511d 100644 --- a/mesonbuild/msetup.py +++ b/mesonbuild/msetup.py @@ -149,13 +149,6 @@ class MesonApp: sys.exit(1) return src_dir, build_dir - def check_pkgconfig_envvar(self, env): - curvar = os.environ.get('PKG_CONFIG_PATH', '') - if curvar != env.coredata.pkgconf_envvar: - mlog.warning('PKG_CONFIG_PATH has changed between invocations from "%s" to "%s".' % - (env.coredata.pkgconf_envvar, curvar)) - env.coredata.pkgconf_envvar = curvar - def generate(self): env = environment.Environment(self.source_dir, self.build_dir, self.options) mlog.initialize(env.get_log_dir(), self.options.fatal_warnings) @@ -169,7 +162,6 @@ class MesonApp: mlog.debug('Main binary:', sys.executable) mlog.debug('Python system:', platform.system()) mlog.log(mlog.bold('The Meson build system')) - self.check_pkgconfig_envvar(env) mlog.log('Version:', coredata.version) mlog.log('Source dir:', mlog.bold(self.source_dir)) mlog.log('Build dir:', mlog.bold(self.build_dir)) |