diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2020-11-02 18:36:51 +0100 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2020-11-02 18:38:09 +0100 |
| commit | 7f5c96378d0fa91265aef7a2d5c33c7953c23b5b (patch) | |
| tree | 7982d871b169cf193afe507821a87fc71252b6fc /src/Compilation.zig | |
| parent | 317c555a5cdc52612e998d8b4bcbaf730be1a6f1 (diff) | |
| download | zig-7f5c96378d0fa91265aef7a2d5c33c7953c23b5b.tar.gz zig-7f5c96378d0fa91265aef7a2d5c33c7953c23b5b.zip | |
Refactor the code according to Andrew's suggestions
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 872eb1a78b..55b1c05104 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -333,7 +333,6 @@ pub const InitOptions = struct { keep_source_files_loaded: bool = false, clang_argv: []const []const u8 = &[0][]const u8{}, lld_argv: []const []const u8 = &[0][]const u8{}, - syslibroot: ?[]const u8 = null, lib_dirs: []const []const u8 = &[0][]const u8{}, rpath_list: []const []const u8 = &[0][]const u8{}, c_source_files: []const CSourceFile = &[0]CSourceFile{}, @@ -473,6 +472,11 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation { break :blk false; }; + const syslibroot = if (use_lld and options.is_native_os and options.target.isDarwin()) blk: { + const syslibroot_path = try std.zig.system.getSDKPath(arena); + break :blk syslibroot_path; + } else null; + const link_libc = options.link_libc or target_util.osRequiresLibC(options.target); const must_dynamic_link = dl: { @@ -774,7 +778,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation { .frameworks = options.frameworks, .framework_dirs = options.framework_dirs, .system_libs = system_libs, - .syslibroot = options.syslibroot, + .syslibroot = syslibroot, .lib_dirs = options.lib_dirs, .rpath_list = options.rpath_list, .strip = strip, |