1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.1 2021/09/27 18:50:06 adam Exp $
Specify c++ language when making CXX parse standard input.
Fixes problem where graphics/MesaLib fails to build due to:
> clang++ -std=c++14 -dM -E -
> error: invalid argument '-std=c++14' not allowed with 'C'
--- mesonbuild/compilers/detect.py.orig 2021-09-10 05:30:31.000000000 +0000
+++ mesonbuild/compilers/detect.py
@@ -1162,7 +1162,10 @@ def _get_gnu_compiler_defines(compiler:
"""
# Arguments to output compiler pre-processor defines to stdout
# gcc, g++, and gfortran all support these arguments
- args = compiler + ['-E', '-dM', '-']
+ args = compiler + ['-E', '-dM']
+ if compiler[0].endswith('++'):
+ args += ['-x', 'c++']
+ args += ['-']
p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
if p.returncode != 0:
raise EnvironmentException('Unable to detect GNU compiler type:\n' + output + error)
@@ -1186,7 +1189,10 @@ def _get_clang_compiler_defines(compiler
"""
Get the list of Clang pre-processor defines
"""
- args = compiler + ['-E', '-dM', '-']
+ args = compiler + ['-E', '-dM']
+ if compiler[0].endswith('++'):
+ args += ['-x', 'c++']
+ args += ['-']
p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
if p.returncode != 0:
raise EnvironmentException('Unable to get clang pre-processor defines:\n' + output + error)
|
