diff options
| author | Isaac Freund <ifreund@ifreund.xyz> | 2020-12-11 23:02:35 +0100 |
|---|---|---|
| committer | Isaac Freund <ifreund@ifreund.xyz> | 2020-12-13 00:40:35 +0100 |
| commit | 1d8f33ca98493d63c509e0a23b8dc512f4d7b79f (patch) | |
| tree | f81c326ceef3cb9a010f85af5092274d908381ad /src/Compilation.zig | |
| parent | 078a64f8d9b50ad99afe12ba3038afc3e68f507c (diff) | |
| download | zig-1d8f33ca98493d63c509e0a23b8dc512f4d7b79f.tar.gz zig-1d8f33ca98493d63c509e0a23b8dc512f4d7b79f.zip | |
stage2: link musl dynamically by default if native
If targeting the native OS and the system libc is musl, link against it
dynamically by default.
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 1c8edcfde2..81a2bff37b 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -385,6 +385,7 @@ pub const InitOptions = struct { single_threaded: bool = false, function_sections: bool = false, is_native_os: bool, + is_native_abi: bool, time_report: bool = false, stack_report: bool = false, link_eh_frame_hdr: bool = false, @@ -600,7 +601,19 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation { break :dl false; }; - const default_link_mode: std.builtin.LinkMode = if (must_dynamic_link) .Dynamic else .Static; + const default_link_mode: std.builtin.LinkMode = blk: { + if (must_dynamic_link) { + break :blk .Dynamic; + } else if (is_exe_or_dyn_lib and link_libc and + options.is_native_abi and options.target.abi.isMusl()) + { + // If targeting the system's native ABI and the system's + // libc is musl, link dynamically by default. + break :blk .Dynamic; + } else { + break :blk .Static; + } + }; const link_mode: std.builtin.LinkMode = if (options.link_mode) |lm| blk: { if (lm == .Static and must_dynamic_link) { return error.UnableToStaticLink; @@ -910,6 +923,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation { .rpath_list = options.rpath_list, .strip = strip, .is_native_os = options.is_native_os, + .is_native_abi = options.is_native_abi, .function_sections = options.function_sections, .allow_shlib_undefined = options.linker_allow_shlib_undefined, .bind_global_refs_locally = options.linker_bind_global_refs_locally orelse false, @@ -2778,6 +2792,7 @@ fn buildOutputFromZig( .emit_h = null, .strip = comp.bin_file.options.strip, .is_native_os = comp.bin_file.options.is_native_os, + .is_native_abi = comp.bin_file.options.is_native_abi, .self_exe_path = comp.self_exe_path, .verbose_cc = comp.verbose_cc, .verbose_link = comp.bin_file.options.verbose_link, @@ -3148,6 +3163,7 @@ pub fn build_crt_file( .emit_h = null, .strip = comp.bin_file.options.strip, .is_native_os = comp.bin_file.options.is_native_os, + .is_native_abi = comp.bin_file.options.is_native_abi, .self_exe_path = comp.self_exe_path, .c_source_files = c_source_files, .verbose_cc = comp.verbose_cc, |