Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve Clang failure to use -Og with --optimization=g 

Clang supports the GCC -Og flag, but --optimization=g is not setting that. This is because Clang is referencing the clike_optimization_args, which does not define a flag for 'g'.

To address this, we'll mimic the GNU options instead of the C-like ones.

Fixes #6619
This commit is contained in:
Phillip Johnston 2020-03-12 13:32:39 -07:00 committed by Jussi Pakkanen
parent b54e557a40
commit 79198de6cf
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mesonbuild/compilers/mixins/clang.py
View File

@ -19,7 +19,6 @@ import typing as T
from ... import mesonlib
from ...linkers import AppleDynamicLinker
from ..compilers import clike_optimization_args
from .gnu import GnuLikeCompiler
if T.TYPE_CHECKING:
@ -32,6 +31,14 @@ clang_color_args = {
'never': ['-Xclang', '-fno-color-diagnostics'],
} # type: T.Dict[str, T.List[str]]
clang_optimization_args = {
'0': [],
'g': ['-Og'],
'1': ['-O1'],
'2': ['-O2'],
'3': ['-O3'],
's': ['-Os'],
} # type: T.Dict[str, T.List[str]]
class ClangCompiler(GnuLikeCompiler):
def __init__(self):
@ -49,7 +56,7 @@ class ClangCompiler(GnuLikeCompiler):
return clang_color_args[colortype][:]
def get_optimization_args(self, optimization_level: str) -> T.List[str]:
return clike_optimization_args[optimization_level]
return clang_optimization_args[optimization_level]
def get_pch_suffix(self) -> str:
return 'pch'