aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mconf.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-05-13 10:36:58 -0400
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-06 20:02:37 +0000
commitb7d442150dd8575f0756e3bc9e953d0f198e16c6 (patch)
treeea286310111e3e1103db39908cdb8295a3b337f0 /mesonbuild/mconf.py
parent58a9555ddf49d851a7eb56874df1d0b3f498e53e (diff)
downloadmeson-b7d442150dd8575f0756e3bc9e953d0f198e16c6.zip
meson-b7d442150dd8575f0756e3bc9e953d0f198e16c6.tar.gz
meson-b7d442150dd8575f0756e3bc9e953d0f198e16c6.tar.bz2
Move <lang>_args to coredata.compiler_options
Diffstat (limited to 'mesonbuild/mconf.py')
-rw-r--r--mesonbuild/mconf.py21
1 files changed, 0 insertions, 21 deletions
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py
index f65d6ff..9ac5d4a 100644
--- a/mesonbuild/mconf.py
+++ b/mesonbuild/mconf.py
@@ -114,21 +114,6 @@ class Conf:
elif k in self.coredata.base_options:
tgt = self.coredata.base_options[k]
tgt.set_value(v)
- elif k.endswith('_link_args'):
- lang = k[:-10]
- if lang not in self.coredata.external_link_args:
- raise ConfException('Unknown language %s in linkargs.' % lang)
- # TODO, currently split on spaces, make it so that user
- # can pass in an array string.
- newvalue = shlex.split(v)
- self.coredata.external_link_args[lang] = newvalue
- elif k.endswith('_args'):
- lang = k[:-5]
- if lang not in self.coredata.external_args:
- raise ConfException('Unknown language %s in compile args' % lang)
- # TODO same fix as above
- newvalue = shlex.split(v)
- self.coredata.external_args[lang] = newvalue
else:
raise ConfException('Unknown option %s.' % k)
@@ -161,12 +146,6 @@ class Conf:
o = self.coredata.base_options[k]
coarr.append({'name': k, 'descr': o.description, 'value': o.value, 'choices': o.choices})
self.print_aligned(coarr)
- print('\nCompiler arguments:')
- for (lang, args) in self.coredata.external_args.items():
- print(' ' + lang + '_args', str(args))
- print('\nLinker args:')
- for (lang, args) in self.coredata.external_link_args.items():
- print(' ' + lang + '_link_args', str(args))
print('\nCompiler options:')
if not self.coredata.compiler_options:
print(' No compiler options\n')