diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-05-05 23:16:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-05 23:16:50 +0200 |
| commit | 08d05bd82dfea8c58847a71c6f2362274aadd812 (patch) | |
| tree | 514d3c7bf58a60b2cb7f2df11fd07d932687b6d3 /mesonbuild/compilers.py | |
| parent | ae04624730491e2dff3cdb247775bc7839cbf350 (diff) | |
| parent | 7dccf0c5adc8f92192ffe8688abf29a51eb86bc5 (diff) | |
| download | meson-08d05bd82dfea8c58847a71c6f2362274aadd812.zip meson-08d05bd82dfea8c58847a71c6f2362274aadd812.tar.gz meson-08d05bd82dfea8c58847a71c6f2362274aadd812.tar.bz2 | |
Merge pull request #1738 from mesonbuild/fix1726
Strip GCC comments from output before parsing in get_define. Closes #…
Diffstat (limited to 'mesonbuild/compilers.py')
| -rw-r--r-- | mesonbuild/compilers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 3d2cd96..406c719 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -782,7 +782,7 @@ class CCompiler(Compiler): return self.exelist[:] def get_preprocess_only_args(self): - return ['-E'] + return ['-E', '-P'] def get_compile_only_args(self): return ['-c'] @@ -1139,10 +1139,10 @@ class CCompiler(Compiler): delim = '"MESON_GET_DEFINE_DELIMITER"' fargs = {'prefix': prefix, 'define': dname, 'delim': delim} code = ''' + {prefix} #ifndef {define} # define {define} #endif - {prefix} {delim}\n{define}''' args = self._get_compiler_check_args(env, extra_args, dependencies, mode='preprocess').to_native() @@ -2135,7 +2135,7 @@ class VisualStudioCCompiler(CCompiler): return ['/FI' + base, '/Yu' + base, '/Fp' + os.path.join(pch_dir, pchname)] def get_preprocess_only_args(self): - return ['/E'] + return ['/EP'] def get_compile_only_args(self): return ['/c'] |