picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "meson: use c_args in generator scripts (#10289)" 

This reverts commit 56f56d5ad8.

This broke the compilation for coverity under travis. Our build script does
something like this:

$ CFLAGS='-D_Float128=long\ double -D_Float64=double -D_Float64x=long\ double -D_Float32=float -D_Float32x=double' meson cov-build -Dman=false
$ ninja -C build
...
[pid 27096] execve("/usr/bin/cc", ["/usr/bin/cc", "-D_Float128=long", "double", "-D_Float64=double", "-D_Float64x=long", "double", "-D_Float32=float", "-D_Float32x=double", "-E", "-dM", "-include", "linux/capability.h", "-include", "config.h", "-include", "../src/basic/missing.h", "-"], 0x55ab75ea4e80 /* 91 vars */) = 0
cc: error: double: No such file or directory
cc: error: double: No such file or directory
[pid 27096] +++ exited with 1 +++

I'm sure this could be fixed somehow, but since the original motivation for
56f56d5ad8 wasn't very strong, let's just revert
it as this seems to be the simplest solution.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-10-11 15:12:41 +02:00 committed by Lennart Poettering
parent 9cebb234b1
commit 0e3cc902fa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -395,7 +395,7 @@ if cc.compiles('''
add_project_arguments('-Werror=shadow', language : 'c')
endif
cpp = ' '.join(cc.cmd_array() + get_option('c_args')) + ' -E'
cpp = ' '.join(cc.cmd_array()) + ' -E'
#####################################################################
# compilation result tests