meson: Remove un-used target_lib_prefix variables

keith-packard · keith-packard · commit cf4177a0416b · 2025-11-06T14:25:16.000-08:00
The value of 'lib_prefix' is only necessary when building libraries
that will be installed via the kludge of pasting path names together
as a library name (which emits meson warnings).

Remove all other uses of this variable and target parameter.

Signed-off-by: Keith Packard &lt;keithp@keithp.com&gt;
diff --git a/meson.build b/meson.build
@@ -1008,7 +1008,6 @@ foreach params : [default_target] + targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   custom_mem_config = ''
 
@@ -1612,7 +1611,6 @@ if has_semihost
     target = params['name']
     target_dir = params['dir']
     target_c_args = params['c_args']
-    target_lib_prefix = params['lib_prefix']
     if target == 'default-target'
       test_link_args_variable = 'test_link_args'
       test_linker_files_variable = 'test_linker_files'
diff --git a/newlib/libc/machine/aarch64/meson.build b/newlib/libc/machine/aarch64/meson.build
@@ -76,7 +76,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
     set_variable('lib_machine' + target,
         static_library('machine' + target,
             srcs_machine,
diff --git a/newlib/libc/machine/arc/meson.build b/newlib/libc/machine/arc/meson.build
@@ -75,7 +75,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
   set_variable('lib_machine' + target,
 	       static_library('machine' + target,
 			      srcs_machine,
diff --git a/newlib/libc/machine/arc64/meson.build b/newlib/libc/machine/arc64/meson.build
@@ -52,7 +52,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
   set_variable('lib_machine' + target,
 	       static_library('machine' + target,
 			      srcs_machine,
diff --git a/newlib/libc/machine/arm/meson.build b/newlib/libc/machine/arm/meson.build
@@ -55,7 +55,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 	set_variable('lib_machine' + target,
 		static_library('machine' + target,
 			srcs_machine,
diff --git a/newlib/libc/machine/hexagon/meson.build b/newlib/libc/machine/hexagon/meson.build
@@ -40,7 +40,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 	set_variable('lib_machine' + target,
 		static_library('machine' + target,
 			srcs_machine,
diff --git a/newlib/libc/machine/loongarch/meson.build b/newlib/libc/machine/loongarch/meson.build
@@ -43,7 +43,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 	set_variable('lib_machine' + target,
 		static_library('machine' + target,
 			srcs_machine,
diff --git a/newlib/libc/machine/m68k/meson.build b/newlib/libc/machine/m68k/meson.build
@@ -46,7 +46,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 	set_variable('lib_machine' + target,
 		static_library('machine' + target,
 			srcs_machine,
diff --git a/newlib/libc/machine/msp430/meson.build b/newlib/libc/machine/msp430/meson.build
@@ -41,7 +41,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
   set_variable('lib_machine' + target,
 	       static_library('machine' + target,
 			      srcs_machine,
diff --git a/newlib/libc/machine/riscv/meson.build b/newlib/libc/machine/riscv/meson.build
@@ -54,7 +54,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 	set_variable('lib_machine' + target,
 		static_library('machine' + target,
 			srcs_machine,
diff --git a/newlib/libc/machine/x86/meson.build b/newlib/libc/machine/x86/meson.build
@@ -55,7 +55,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
   set_variable('lib_machine' + target,
 	       static_library('machine' + target,
 			      srcs_machine,
diff --git a/newlib/libc/meson.build b/newlib/libc/meson.build
@@ -81,7 +81,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
   libobjs = []
   libsrcs_target = []
 
diff --git a/newlib/libc/stdlib/meson.build b/newlib/libc/stdlib/meson.build
@@ -257,7 +257,6 @@ if enable_malloc
     target = params['name']
     target_dir = params['dir']
     target_c_args = params['c_args']
-    target_lib_prefix = params['lib_prefix']
 
     # Have to build a sub-library to get custom c_args for malloc
     set_variable('lib_stdlib' + target,
diff --git a/newlib/libc/string/meson.build b/newlib/libc/string/meson.build
@@ -196,7 +196,6 @@ if srcs_strcmp_use != []
     target = params['name']
     target_dir = params['dir']
     target_c_args = params['c_args']
-    target_lib_prefix = params['lib_prefix']
 
     set_variable('lib_string' + target,
 		 static_library('strcmp' + target,
diff --git a/newlib/libm/machine/x86/meson.build b/newlib/libm/machine/x86/meson.build
@@ -78,7 +78,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
   if cc.compiles(x86_64_code,
                  name: 'x86_64 check',
                  args: target_c_args + c_args)
diff --git a/newlib/libm/meson.build b/newlib/libm/meson.build
@@ -65,7 +65,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
   libobjs = []
   libsrcs_target = []
 
diff --git a/newlib/libm/test/meson.build b/newlib/libm/test/meson.build
@@ -152,7 +152,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   if target.strip('_') in skip_math_test
     continue
diff --git a/newlib/testsuite/newlib.iconv/meson.build b/newlib/testsuite/newlib.iconv/meson.build
@@ -39,7 +39,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/newlib/testsuite/newlib.locale/meson.build b/newlib/testsuite/newlib.locale/meson.build
@@ -45,7 +45,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/newlib/testsuite/newlib.search/meson.build b/newlib/testsuite/newlib.search/meson.build
@@ -39,7 +39,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/newlib/testsuite/newlib.stdio/meson.build b/newlib/testsuite/newlib.stdio/meson.build
@@ -43,7 +43,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/newlib/testsuite/newlib.stdlib/meson.build b/newlib/testsuite/newlib.stdlib/meson.build
@@ -39,7 +39,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/newlib/testsuite/newlib.string/meson.build b/newlib/testsuite/newlib.string/meson.build
@@ -39,7 +39,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/newlib/testsuite/newlib.time/meson.build b/newlib/testsuite/newlib.time/meson.build
@@ -39,7 +39,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/newlib/testsuite/newlib.wctype/meson.build b/newlib/testsuite/newlib.wctype/meson.build
@@ -41,7 +41,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/test/libc-testsuite/meson.build b/test/libc-testsuite/meson.build
@@ -54,7 +54,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/test/meson.build b/test/meson.build
@@ -139,7 +139,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/test/semihost/meson.build b/test/semihost/meson.build
@@ -82,7 +82,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   _libs += [get_variable('lib_semihost' + target)]
diff --git a/test/test-math/meson.build b/test/test-math/meson.build
@@ -112,7 +112,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
diff --git a/test/test-string/meson.build b/test/test-string/meson.build
@@ -44,7 +44,6 @@ foreach params : targets
   target = params['name']
   target_dir = params['dir']
   target_c_args = params['c_args']
-  target_lib_prefix = params['lib_prefix']
 
   _libs = [get_variable('lib_c' + target)]
   if is_variable('lib_semihost' + target)
