fix compilation with latest V, unblock vlang/v#17375

vlang · Apr 14, 2023 · 369ee2c · 369ee2c
1 parent 9ed88a7
commit 369ee2c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/android/ndk/ndk.v b/android/ndk/ndk.v
@@ -364,7 +364,6 @@ pub fn compiler_triplet(arch string) string {
 	return arch_is + '-linux-android${eabi}'
 }
 
-[inline]
 pub fn libs_path(ndk_version string, arch string, api_level string) !string {
 	mut host_architecture := host_arch()
 	mut arch_is := arch_to_instruction_set(arch)
@@ -398,7 +397,6 @@ pub fn libs_path(ndk_version string, arch string, api_level string) !string {
 	return libs_path
 }
 
-[inline]
 pub fn sysroot_path(ndk_version string) !string {
 	// NOTE "$ndk_root/sysroot/usr/include" was deprecated since NDK r19
 	mut sysroot_path := os.join_path(root_version(ndk_version), 'toolchains', 'llvm',

diff --git a/cli/cli.v b/cli/cli.v
@@ -155,7 +155,7 @@ pub fn args_to_options(arguments []string, defaults Options) !(Options, &flag.Fl
 	}
 
 	opt.additional_args = fp.finalize() or {
-		return error(@FN + ': flag parser failed finalizing: ${err}')
+		return error(@FN + ': flag parser failed finalizing: ${err.msg()}')
 	}
 
 	mut c_flags := []string{}

diff --git a/tests/check_non_existing_flag.out b/tests/check_non_existing_flag.out
@@ -1,2 +1,2 @@
-Error while parsing `os.args`: args_to_options: flag parser failed finalizing: flag.UnkownFlagError: Unknown flag `--non-existing-flag`
+Error while parsing `os.args`: args_to_options: flag parser failed finalizing: Unknown flag `--non-existing-flag`
 Use `vab -h` to see all flags