Index: kernel/meson.build
===================================================================
--- kernel/meson.build	(revision 41408d9416b973ae77a095adf3dc309772bd1c56)
+++ kernel/meson.build	(revision 5f176da24d28494c81340ae9aed9fb8d6d7a36fa)
@@ -3,5 +3,5 @@
 
 # Fills arch_src.
-subdir('arch' / h_arch)
+subdir('arch' / KARCH)
 
 # Defines genarch_src.
@@ -21,6 +21,6 @@
 	'generic/include',
 	'genarch/include',
-	'arch' / h_arch / 'include',
-	'..' / 'abi' / 'arch' / h_arch / 'include',
+	'arch' / KARCH / 'include',
+	'..' / 'abi' / 'arch' / KARCH / 'include',
 	'..' / 'abi' / 'include',
 	'test',
@@ -39,5 +39,5 @@
 # Preprocess linker script using C preprocessor.
 kernel_ldscript = custom_target('_link.ld',
-	input: 'arch' / h_arch / '_link.ld.in',
+	input: 'arch' / KARCH / '_link.ld.in',
 	output: '_link.ld',
 	command: [
@@ -45,5 +45,5 @@
 		arch_kernel_c_args,
 		kernel_defs,
-		'-I' + meson.current_source_dir() / 'arch' / h_arch / 'include',
+		'-I' + meson.current_source_dir() / 'arch' / KARCH / 'include',
 		'-D__ASSEMBLER__',
 		'-D__LINKER__',
Index: kernel/test/meson.build
===================================================================
--- kernel/test/meson.build	(revision 41408d9416b973ae77a095adf3dc309772bd1c56)
+++ kernel/test/meson.build	(revision 5f176da24d28494c81340ae9aed9fb8d6d7a36fa)
@@ -24,5 +24,5 @@
 	)
 
-	if h_arch == 'mips32'
+	if KARCH == 'mips32'
 		test_src += files('debug/mips1.c')
 	else
@@ -30,5 +30,5 @@
 	endif
 
-	if h_arch == 'ia64'
+	if KARCH == 'ia64'
 		test_src += files('mm/purge1.c')
 	else