Fix static build on macOS

thomasjm · thomasjm · commit 52e5891105b1 · 2025-11-11T03:57:33.000-08:00
diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build
@@ -98,7 +98,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
   cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
diff --git a/src/libexpr-c/meson.build b/src/libexpr-c/meson.build
@@ -53,7 +53,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libexpr-test-support/meson.build b/src/libexpr-test-support/meson.build
@@ -49,7 +49,7 @@ this_library = library(
   # TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326
   #       is available. See also ../libutil/build.meson
   link_args : linker_export_flags + [ '-lrapidcheck' ],
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build
@@ -183,7 +183,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
   cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
diff --git a/src/libfetchers-c/meson.build b/src/libfetchers-c/meson.build
@@ -56,7 +56,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libfetchers/meson.build b/src/libfetchers/meson.build
@@ -64,7 +64,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
   cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
diff --git a/src/libflake-c/meson.build b/src/libflake-c/meson.build
@@ -56,7 +56,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libflake/meson.build b/src/libflake/meson.build
@@ -61,7 +61,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libmain-c/meson.build b/src/libmain-c/meson.build
@@ -48,7 +48,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libmain/meson.build b/src/libmain/meson.build
@@ -80,7 +80,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libstore-c/meson.build b/src/libstore-c/meson.build
@@ -49,7 +49,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libstore-test-support/meson.build b/src/libstore-test-support/meson.build
@@ -49,7 +49,7 @@ this_library = library(
   # TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326
   #       is available. See also ../libutil/build.meson
   link_args : linker_export_flags + [ '-lrapidcheck' ],
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libstore/meson.build b/src/libstore/meson.build
@@ -175,6 +175,8 @@ foreach header : [
 endforeach
 
 busybox = find_program(get_option('sandbox-shell'), required : false)
+# When busybox is not available, use bash as fallback for embedded shell
+bash = find_program('bash', required : get_option('embedded-sandbox-shell'))
 
 configdata_priv.set(
   'HAVE_EMBEDDED_SANDBOX_SHELL',
@@ -189,10 +191,12 @@ endif
 
 if get_option('embedded-sandbox-shell')
   hexdump = find_program('hexdump', native : true)
+  # Use busybox if available, otherwise use bash
+  embed_shell = busybox.found() ? busybox : bash
   embedded_sandbox_shell_gen = custom_target(
     'embedded-sandbox-shell.gen.hh',
     command : [ hexdump, '-v', '-e', '1/1 "0x%x," "\n"' ],
-    input : busybox.full_path(),
+    input : embed_shell.full_path(),
     output : 'embedded-sandbox-shell.gen.hh',
     capture : true,
     feed : true,
@@ -364,7 +368,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
   cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
diff --git a/src/libutil-c/meson.build b/src/libutil-c/meson.build
@@ -56,7 +56,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libutil-test-support/meson.build b/src/libutil-test-support/meson.build
@@ -46,7 +46,7 @@ this_library = library(
   # TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326
   #       is available. See also ../libutil/build.meson
   link_args : linker_export_flags + [ '-lrapidcheck' ],
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
 )
 
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
@@ -201,7 +201,7 @@ this_library = library(
   dependencies : deps_public + deps_private + deps_other,
   include_directories : include_dirs,
   link_args : linker_export_flags,
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
   cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
diff --git a/src/nix/meson.build b/src/nix/meson.build
@@ -181,12 +181,19 @@ endif
 
 include_dirs = [ include_directories('.') ]
 
+# Use system iconv on macOS static builds with symbol aliasing
+iconv_link_args = []
+if get_option('default_library') == 'static' and host_machine.system() == 'darwin'
+  # Use system iconv and create aliases for GNU-style symbols
+  iconv_link_args = ['-liconv', '-Wl,-alias,_iconv,_libiconv', '-Wl,-alias,_iconv_open,_libiconv_open', '-Wl,-alias,_iconv_close,_libiconv_close']
+endif
+
 this_exe = executable(
   meson.project_name(),
   sources,
   dependencies : deps_private_subproject + deps_private + deps_other,
   include_directories : include_dirs,
-  link_args : linker_export_flags,
+  link_args : linker_export_flags + iconv_link_args,
   install : true,
   cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
diff --git a/src/perl/lib/Nix/meson.build b/src/perl/lib/Nix/meson.build
@@ -44,7 +44,7 @@ nix_perl_store_lib = library(
   'Store',
   sources : nix_perl_store_cc,
   name_prefix : '',
-  prelink : true, # For C++ static initializers
+  prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS
   install : true,
   install_mode : 'rwxr-xr-x',
   install_dir : join_paths(nix_perl_install_dir, 'auto', 'Nix', 'Store'),

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ this_library = library(`
`98`	`98`	`dependencies : deps_public + deps_private + deps_other,`
`99`	`99`	`include_directories : include_dirs,`
`100`	`100`	`link_args : linker_export_flags,`
`101`		`- prelink : true, # For C++ static initializers`
	`101`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`102`	`102`	`install : true,`
`103`	`103`	`cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],`
`104`	`104`	`)`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ this_library = library(`
`53`	`53`	`dependencies : deps_public + deps_private + deps_other,`
`54`	`54`	`include_directories : include_dirs,`
`55`	`55`	`link_args : linker_export_flags,`
`56`		`- prelink : true, # For C++ static initializers`
	`56`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`57`	`57`	`install : true,`
`58`	`58`	`)`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ this_library = library(`
`49`	`49`	# TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326
`50`	`50`	`# is available. See also ../libutil/build.meson`
`51`	`51`	`link_args : linker_export_flags + [ '-lrapidcheck' ],`
`52`		`- prelink : true, # For C++ static initializers`
	`52`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`53`	`53`	`install : true,`
`54`	`54`	`)`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ this_library = library(`
`183`	`183`	`dependencies : deps_public + deps_private + deps_other,`
`184`	`184`	`include_directories : include_dirs,`
`185`	`185`	`link_args : linker_export_flags,`
`186`		`- prelink : true, # For C++ static initializers`
	`186`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`187`	`187`	`install : true,`
`188`	`188`	`cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],`
`189`	`189`	`)`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ this_library = library(`
`56`	`56`	`dependencies : deps_public + deps_private + deps_other,`
`57`	`57`	`include_directories : include_dirs,`
`58`	`58`	`link_args : linker_export_flags,`
`59`		`- prelink : true, # For C++ static initializers`
	`59`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`60`	`60`	`install : true,`
`61`	`61`	`)`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ this_library = library(`
`64`	`64`	`dependencies : deps_public + deps_private + deps_other,`
`65`	`65`	`include_directories : include_dirs,`
`66`	`66`	`link_args : linker_export_flags,`
`67`		`- prelink : true, # For C++ static initializers`
	`67`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`68`	`68`	`install : true,`
`69`	`69`	`cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],`
`70`	`70`	`)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ this_library = library(`
`61`	`61`	`dependencies : deps_public + deps_private + deps_other,`
`62`	`62`	`include_directories : include_dirs,`
`63`	`63`	`link_args : linker_export_flags,`
`64`		`- prelink : true, # For C++ static initializers`
	`64`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`65`	`65`	`install : true,`
`66`	`66`	`)`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ this_library = library(`
`48`	`48`	`dependencies : deps_public + deps_private + deps_other,`
`49`	`49`	`include_directories : include_dirs,`
`50`	`50`	`link_args : linker_export_flags,`
`51`		`- prelink : true, # For C++ static initializers`
	`51`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`52`	`52`	`install : true,`
`53`	`53`	`)`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ this_library = library(`
`80`	`80`	`dependencies : deps_public + deps_private + deps_other,`
`81`	`81`	`include_directories : include_dirs,`
`82`	`82`	`link_args : linker_export_flags,`
`83`		`- prelink : true, # For C++ static initializers`
	`83`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`84`	`84`	`install : true,`
`85`	`85`	`)`
`86`	`86`