[Mesa-dev] [PATCH] scons: Fix CC env quoting.

Roland Scheidegger sroland at vmware.com
Mon Jul 9 20:29:33 UTC 2018


Am 09.07.2018 um 21:57 schrieb Jose Fonseca:
> Handle the case where there are spaces in CC env var (ie, compiler +
> options.)
> 
> This updates the CC check to match what newer SCons do internally.
> ---
>  scons/gallium.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/scons/gallium.py b/scons/gallium.py
> index 7cb2a32549..c05d8637e1 100755
> --- a/scons/gallium.py
> +++ b/scons/gallium.py
> @@ -134,7 +134,8 @@ def check_cc(env, cc, expr, cpp_opt = '-E'):
>      source.write('#if !(%s)\n#error\n#endif\n' % expr)
>      source.close()
>  
> -    pipe = SCons.Action._subproc(env, [env['CC'], cpp_opt, source.name],
> +    cmd = SCons.Util.CLVar(env['CC']) + [cpp_opt, source.name]
> +    pipe = SCons.Action._subproc(env, cmd,
>                                   stdin = 'devnull',
>                                   stderr = 'devnull',
>                                   stdout = 'devnull')
> 

Reviewed-by: Roland Scheidegger <sroland at vmware.com>




More information about the mesa-dev mailing list