diff options
| author | Michael Dusan <michael.dusan@gmail.com> | 2023-09-25 15:51:57 -0400 |
|---|---|---|
| committer | Michael Dusan <michael.dusan@gmail.com> | 2023-09-25 17:07:41 -0400 |
| commit | ebd0776b28c50169936b58f8ba05be70e854fd35 (patch) | |
| tree | edaccbd6332b18897db92748ec7d3c2a20baf808 /src/Compilation.zig | |
| parent | f6877fbc4905b1bcd582415baebf3329725a1a43 (diff) | |
| download | zig-ebd0776b28c50169936b58f8ba05be70e854fd35.tar.gz zig-ebd0776b28c50169936b58f8ba05be70e854fd35.zip | |
kubkon review changes: 3
- make vendored settings failure unreachable
- rename field `darwinSdkLayout` → `darwin_sdk_layout`
- make `darwin_sdk_layout` optional
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 65e433627f..395a399801 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -1557,7 +1557,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation { .link_libc = link_libc, .link_libcpp = link_libcpp, .link_libunwind = link_libunwind, - .darwinSdkLayout = libc_dirs.darwinSdkLayout, + .darwin_sdk_layout = libc_dirs.darwin_sdk_layout, .objects = options.link_objects, .frameworks = options.frameworks, .framework_dirs = options.framework_dirs, @@ -5287,7 +5287,7 @@ fn detectWin32ResourceIncludeDirs(arena: Allocator, options: InitOptions) !LibCD .libc_installation = null, .libc_framework_dir_list = &.{}, .sysroot = null, - .darwinSdkLayout = .none, + .darwin_sdk_layout = null, }, } } @@ -5656,7 +5656,7 @@ const LibCDirs = struct { libc_installation: ?*const LibCInstallation, libc_framework_dir_list: []const []const u8, sysroot: ?[]const u8, - darwinSdkLayout: link.DarwinSdkLayout, + darwin_sdk_layout: ?link.DarwinSdkLayout, }; fn getZigShippedLibCIncludeDirsDarwin(arena: Allocator, zig_lib_dir: []const u8) !LibCDirs { @@ -5672,7 +5672,7 @@ fn getZigShippedLibCIncludeDirsDarwin(arena: Allocator, zig_lib_dir: []const u8) .libc_installation = null, .libc_framework_dir_list = &.{}, .sysroot = null, - .darwinSdkLayout = .vendored, + .darwin_sdk_layout = .vendored, }; } @@ -5690,7 +5690,7 @@ pub fn detectLibCIncludeDirs( .libc_installation = null, .libc_framework_dir_list = &.{}, .sysroot = null, - .darwinSdkLayout = .none, + .darwin_sdk_layout = null, }; } @@ -5748,7 +5748,7 @@ pub fn detectLibCIncludeDirs( .libc_installation = null, .libc_framework_dir_list = &.{}, .sysroot = null, - .darwinSdkLayout = .none, + .darwin_sdk_layout = null, }; } @@ -5803,7 +5803,7 @@ fn detectLibCFromLibCInstallation(arena: Allocator, target: Target, lci: *const .libc_installation = lci, .libc_framework_dir_list = framework_list.items, .sysroot = sysroot, - .darwinSdkLayout = if (sysroot == null) .none else .sdk, + .darwin_sdk_layout = if (sysroot == null) null else .sdk, }; } @@ -5865,7 +5865,7 @@ fn detectLibCFromBuilding( .libc_installation = null, .libc_framework_dir_list = &.{}, .sysroot = null, - .darwinSdkLayout = .vendored, + .darwin_sdk_layout = .vendored, }; } |