fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 13:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: remove source_root() call in main meson.build

Browse source 
source_root function is deprecated in Meson version 0.56.0, so let's use
instead a current_source_dir() function, available in all Meson
versions.

Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17974>
This commit is contained in:
Konstantin Kharlamov 2022-08-10 02:53:18 +03:00 • committed by Marge Bot
parent 91362340f3
commit db11e300e9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -1511,14 +1511,14 @@ endif
with_ld_version_script = false with_ld_version_script = false
if cc.links('int main() { return 0; }', if cc.links('int main() { return 0; }',
args : '-Wl,--version-script=@0@'.format( args : '-Wl,--version-script=@0@'.format(
join_paths(meson.source_root(), 'build-support/conftest.map')), join_paths(meson.current_source_dir(), 'build-support/conftest.map')),
name : 'version-script') name : 'version-script')
with_ld_version_script = true with_ld_version_script = true
endif endif
with_ld_dynamic_list = false with_ld_dynamic_list = false
if cc.links('int main() { return 0; }', if cc.links('int main() { return 0; }',
args : '-Wl,--dynamic-list=@0@'.format( args : '-Wl,--dynamic-list=@0@'.format(
join_paths(meson.source_root(), 'build-support/conftest.dyn')), join_paths(meson.current_source_dir(), 'build-support/conftest.dyn')),
name : 'dynamic-list') name : 'dynamic-list')
with_ld_dynamic_list = true with_ld_dynamic_list = true
endif endif