diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2018-10-09 11:04:27 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2018-11-15 18:42:25 -0800 |
commit | 28fd725d61bec363d9bcc403e78b38312dfeb276 (patch) | |
tree | 9d0597bf4e553d3d67298522b6ed82bdd2e97458 /mesonbuild/compilers/c.py | |
parent | 21a7528b2fe3176445d918e921fe374acafb6de2 (diff) | |
download | meson-28fd725d61bec363d9bcc403e78b38312dfeb276.zip meson-28fd725d61bec363d9bcc403e78b38312dfeb276.tar.gz meson-28fd725d61bec363d9bcc403e78b38312dfeb276.tar.bz2 |
compilers: fix compiler.compile for Intel Compilers
has_arguments is the wrong thing to fix, since all checks that require
compiler options are based on compiles, it's the right thing to modify.
Diffstat (limited to 'mesonbuild/compilers/c.py')
-rw-r--r-- | mesonbuild/compilers/c.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 1b198b6..240d424 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -410,12 +410,12 @@ class CCompiler(Compiler): dependencies=dependencies) def _get_compiler_check_args(self, env, extra_args, dependencies, mode='compile'): - if callable(extra_args): - extra_args = extra_args(mode) if extra_args is None: extra_args = [] - elif isinstance(extra_args, str): - extra_args = [extra_args] + else: + extra_args = listify(extra_args) + extra_args = listify([e(mode) if callable(e) else e for e in extra_args]) + if dependencies is None: dependencies = [] elif not isinstance(dependencies, list): |