diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2019-02-12 15:51:46 -0800 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2019-04-05 15:08:17 -0700 |
commit | 569e646e1e3556fb5fdb7c4fb012a30145c7145d (patch) | |
tree | 1e42b0750bb3e0f0cce0cb1857916c0b2d7d97b6 /mesonbuild/msetup.py | |
parent | 25eb86382b4b081c1d3992b9bfd9ebc4ab9b3d10 (diff) | |
download | meson-569e646e1e3556fb5fdb7c4fb012a30145c7145d.zip meson-569e646e1e3556fb5fdb7c4fb012a30145c7145d.tar.gz meson-569e646e1e3556fb5fdb7c4fb012a30145c7145d.tar.bz2 |
dependencies: Add command line option for pkg_config_path
This creates a new command line option to store pkg_config_path into,
and store the environment variable into that option. Currently this
works like the environment variable, for both cross and native targets.
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)) |