Fix static build on macOS

thomasjm · thomasjm · commit bb9f6c87fde3 · 2025-11-10T16:20:24.000-08:00
diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build
@@ -100,7 +100,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
@@ -55,7 +55,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
@@ -51,7 +51,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
@@ -195,7 +195,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
@@ -58,7 +58,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
@@ -65,7 +65,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
@@ -58,7 +58,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
@@ -63,7 +63,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
@@ -50,7 +50,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
@@ -82,7 +82,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
@@ -51,7 +51,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
@@ -52,7 +52,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
@@ -202,6 +202,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',
@@ -216,10 +218,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,
@@ -396,7 +400,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
@@ -58,7 +58,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
@@ -48,7 +48,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
@@ -203,7 +203,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
@@ -183,12 +183,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
`@@ -100,7 +100,7 @@ this_library = library(`
`100`	`100`	`dependencies : deps_public + deps_private + deps_other,`
`101`	`101`	`include_directories : include_dirs,`
`102`	`102`	`link_args : linker_export_flags,`
`103`		`- prelink : true, # For C++ static initializers`
	`103`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`104`	`104`	`install : true,`
`105`	`105`	`cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],`
`106`	`106`	`)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ this_library = library(`
`55`	`55`	`dependencies : deps_public + deps_private + deps_other,`
`56`	`56`	`include_directories : include_dirs,`
`57`	`57`	`link_args : linker_export_flags,`
`58`		`- prelink : true, # For C++ static initializers`
	`58`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`59`	`59`	`install : true,`
`60`	`60`	`)`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ this_library = library(`
`51`	`51`	# TODO: Remove `-lrapidcheck` when https://github.com/emil-e/rapidcheck/pull/326
`52`	`52`	`# is available. See also ../libutil/build.meson`
`53`	`53`	`link_args : linker_export_flags + [ '-lrapidcheck' ],`
`54`		`- prelink : true, # For C++ static initializers`
	`54`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`55`	`55`	`install : true,`
`56`	`56`	`)`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ this_library = library(`
`195`	`195`	`dependencies : deps_public + deps_private + deps_other,`
`196`	`196`	`include_directories : include_dirs,`
`197`	`197`	`link_args : linker_export_flags,`
`198`		`- prelink : true, # For C++ static initializers`
	`198`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`199`	`199`	`install : true,`
`200`	`200`	`cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],`
`201`	`201`	`)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ this_library = library(`
`58`	`58`	`dependencies : deps_public + deps_private + deps_other,`
`59`	`59`	`include_directories : include_dirs,`
`60`	`60`	`link_args : linker_export_flags,`
`61`		`- prelink : true, # For C++ static initializers`
	`61`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`62`	`62`	`install : true,`
`63`	`63`	`)`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ this_library = library(`
`65`	`65`	`dependencies : deps_public + deps_private + deps_other,`
`66`	`66`	`include_directories : include_dirs,`
`67`	`67`	`link_args : linker_export_flags,`
`68`		`- prelink : true, # For C++ static initializers`
	`68`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`69`	`69`	`install : true,`
`70`	`70`	`cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],`
`71`	`71`	`)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ this_library = library(`
`63`	`63`	`dependencies : deps_public + deps_private + deps_other,`
`64`	`64`	`include_directories : include_dirs,`
`65`	`65`	`link_args : linker_export_flags,`
`66`		`- prelink : true, # For C++ static initializers`
	`66`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`67`	`67`	`install : true,`
`68`	`68`	`)`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ this_library = library(`
`50`	`50`	`dependencies : deps_public + deps_private + deps_other,`
`51`	`51`	`include_directories : include_dirs,`
`52`	`52`	`link_args : linker_export_flags,`
`53`		`- prelink : true, # For C++ static initializers`
	`53`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`54`	`54`	`install : true,`
`55`	`55`	`)`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ this_library = library(`
`82`	`82`	`dependencies : deps_public + deps_private + deps_other,`
`83`	`83`	`include_directories : include_dirs,`
`84`	`84`	`link_args : linker_export_flags,`
`85`		`- prelink : true, # For C++ static initializers`
	`85`	`+ prelink : host_machine.system() != 'darwin', # For C++ static initializers, not supported on macOS`
`86`	`86`	`install : true,`
`87`	`87`	`)`
`88`	`88`