Merge pull request #1329 from marv7000/fix-meson-warnings

meta: Fix some meson warnings

Author: mintsuki

meson.build

@@ -1,4 +1,4 @@
-project('mlibc', default_options: ['warning_level=2', 'c_std=gnu11', 'cpp_std=c++20'])
+project('mlibc', default_options: ['warning_level=2', 'c_std=gnu11', 'cpp_std=c++20'], meson_version: '>=1.3.0')
 
 fs = import('fs')
 
@@ -35,7 +35,8 @@ internal_conf = configuration_data()
 mlibc_conf = configuration_data()
 
 if not headers_only
-	add_languages('c', 'cpp')
+	add_languages('c', 'cpp', native: true)
+	add_languages('c', 'cpp', native: false)
 	c_compiler = meson.get_compiler('c')
 	cpp_compiler = meson.get_compiler('cpp')
 
@@ -562,8 +563,8 @@ endif
 hdoc = find_program('hdoc', required: false)
 
 conf_data = configuration_data()
-conf_data.set('source_root', meson.source_root())
-conf_data.set('build_root', meson.build_root())
+conf_data.set('source_root', meson.global_source_root())
+conf_data.set('build_root', meson.global_build_root())
 configure_file(input: 'scripts/hdoc.toml.in',
 	output: '.hdoc.toml', configuration: conf_data)
 

tests/meson.build

@@ -223,7 +223,7 @@ else
 		link_with: libc_shared,
 		dependencies: [libc_deps, rtlib_deps]
 	)
-	test_link_args += ['-Wl,--dynamic-linker=' + meson.build_root() + '/ld.so']
+	test_link_args += ['-Wl,--dynamic-linker=' + meson.global_build_root() + '/ld.so']
 
 	if host_machine.system() in ['linux']
 		use_pie = true
@@ -264,7 +264,7 @@ foreach test_name : all_test_cases
 	exec = executable(test_exec_name, [test_name + '.c', test_sources],
 		dependencies: libc_dep,
 		objects: test_objects,
-		build_rpath: meson.build_root(),
+		build_rpath: meson.global_build_root(),
 		override_options: test_override_options,
 		c_args: test_c_args,
 		link_args: test_link_args,
@@ -277,7 +277,7 @@ foreach test_name : all_test_cases
 			suite: test_subdir,
 			should_fail: should_fail,
 			args: [
-				meson.source_root() + '/tests/' + test_name + '.py',
+				meson.global_source_root() + '/tests/' + test_name + '.py',
 				exec
 			],
 			timeout: timeout_sec,
@@ -300,7 +300,7 @@ foreach test_name : all_test_cases
 		endif
 
 		exec = executable('host-libc-' + test_exec_name, test_name + '.c',
-			build_rpath: meson.build_root(),
+			build_rpath: meson.global_build_root(),
 			override_options: host_libc_sanitize_options,
 			c_args: [host_test_c_args + '-D_GNU_SOURCE', '-DUSE_HOST_LIBC', '-pthread', extra_cflags],
 			link_args: ['-lresolv', '-ldl', '-pthread', '-lm', '-lrt'],

tests/rtld/ld_library_path/meson.build

@@ -4,7 +4,7 @@
 
 test_rpath = '$ORIGIN/'
 
-test_ld_path = meson.build_root() / 'tests' / 'rtld' / test_name
+test_ld_path = meson.global_build_root() / 'tests' / 'rtld' / test_name
 test_env += ['LD_LIBRARY_PATH=' + test_ld_path]
 test_native_env += ['LD_LIBRARY_PATH=' + test_ld_path]
 

tests/rtld/meson.build

@@ -23,7 +23,7 @@ host_libc_rtld_nosan_test_cases = [
 ]
 
 foreach test_name : rtld_test_cases
-	test_rpath = meson.build_root() / 'tests' / 'rtld' / test_name / ''
+	test_rpath = meson.global_build_root() / 'tests' / 'rtld' / test_name / ''
 	test_rpath += ':$ORIGIN/' # Workaround old and buggy qemu-user on CI
 
 	test_env = []