mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 04:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

meson: Split c_cpp_args from pre_args

Browse Source 
pre_args should not include compiler options

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19185>
This commit is contained in:
Yonggang Luo 2023-02-11 14:49:59 +08:00 committed by Marge Bot
parent 4ff295e1d8
commit 2626946490
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -54,6 +54,9 @@ pre_args = [
'-DPACKAGE_VERSION="@0@"'.format(meson.project_version()),
'-DPACKAGE_BUGREPORT="https://gitlab.freedesktop.org/mesa/mesa/-/issues"',
]
# Arguments for c or cpp compiler, can be compiler options
c_cpp_args = []
c_args = []
cpp_args = []
@ -741,7 +744,8 @@ if _power8.allowed()
}''',
args : '-mpower8-vector',
name : 'POWER8 intrinsics')
pre_args += ['-D_ARCH_PWR8', '-mpower8-vector']
pre_args += ['-D_ARCH_PWR8']
c_cpp_args += '-mpower8-vector'
elif _power8.enabled()
error('POWER8 intrinsic support required but not found.')
endif
@ -2027,6 +2031,8 @@ if with_perfetto
endif
add_project_arguments(pre_args, language : ['c', 'cpp'])
add_project_arguments(c_cpp_args, language : ['c', 'cpp'])
add_project_arguments(c_args, language : ['c'])
add_project_arguments(cpp_args, language : ['cpp'])