Module: Mesa
Branch: main
Commit: db11e300e92d28fb9c220d0dcdfe36b33403157e
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=db11e300e92d28fb9c220d0dcdfe36b33403157e

Author: Konstantin Kharlamov <[email protected]>
Date:   Wed Aug 10 02:53:18 2022 +0300

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

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 <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17974>

---

 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index b221a58610a..558c6ab49b4 100644
--- a/meson.build
+++ b/meson.build
@@ -1511,14 +1511,14 @@ endif
 with_ld_version_script = false
 if cc.links('int main() { return 0; }',
             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')
   with_ld_version_script = true
 endif
 with_ld_dynamic_list = false
 if cc.links('int main() { return 0; }',
             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')
   with_ld_dynamic_list = true
 endif

Reply via email to