diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-12 12:16:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-12 12:16:16 -0500 |
| commit | 1d9c40c9c311e2f015104dcfa568a9eaf82a1e76 (patch) | |
| tree | 145f1ad0639c043c5faa42e10ca658532719df0d /mesonbuild/compilers.py | |
| parent | 55288b0fcc8e80da9b7d96747c1478580c7e9130 (diff) | |
| parent | ba316a0dff6e215394c0b2b4de2a46c56af6904c (diff) | |
| download | meson-1d9c40c9c311e2f015104dcfa568a9eaf82a1e76.zip meson-1d9c40c9c311e2f015104dcfa568a9eaf82a1e76.tar.gz meson-1d9c40c9c311e2f015104dcfa568a9eaf82a1e76.tar.bz2 | |
Merge pull request #1027 from centricular/has-header-prefix
cc.has_header: Allow specifying a prefix for headers
Diffstat (limited to 'mesonbuild/compilers.py')
| -rw-r--r-- | mesonbuild/compilers.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 78f2c34..9b76f29 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -638,13 +638,11 @@ class CCompiler(Compiler): code = 'int main(int argc, char **argv) { int class=0; return class; }\n' return self.sanity_check_impl(work_dir, environment, 'sanitycheckc.c', code) - def has_header(self, hname, env, extra_args=None, dependencies=None): + def has_header(self, hname, prefix, env, extra_args=None, dependencies=None): if extra_args is None: extra_args = [] - templ = '''#include<%s> -int someSymbolHereJustForFun; -''' - return self.compiles(templ % hname, env, extra_args, dependencies) + code = '{}\n#include<{}>\nint someUselessSymbol;'.format(prefix, hname) + return self.compiles(code, env, extra_args, dependencies) def has_header_symbol(self, hname, symbol, prefix, env, extra_args=None, dependencies=None): if extra_args is None: |