aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2023-08-02 16:25:45 -0700
committerAndrew Kelley <andrew@ziglang.org>2023-08-03 09:52:15 -0700
commite582a3642bb001a7a19ecb72b128f45ab7fc08aa (patch)
tree81b880b895b220fd14e21756e59956ff8d9b6ffd /lib
parentda91ef5c28bd11823bd84b6f54df9ca601f03e21 (diff)
downloadzig-e582a3642bb001a7a19ecb72b128f45ab7fc08aa.tar.gz
zig-e582a3642bb001a7a19ecb72b128f45ab7fc08aa.zip
std.zig.system.darwin: fix redundant names
Diffstat (limited to 'lib')
-rw-r--r--lib/std/zig/system/NativePaths.zig4
-rw-r--r--lib/std/zig/system/darwin.zig10
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/std/zig/system/NativePaths.zig b/lib/std/zig/system/NativePaths.zig
index 61f71144ca..1fd92292f9 100644
--- a/lib/std/zig/system/NativePaths.zig
+++ b/lib/std/zig/system/NativePaths.zig
@@ -79,8 +79,8 @@ pub fn detect(arena: Allocator, native_info: NativeTargetInfo) !NativePaths {
// TODO: consider also adding homebrew paths
// TODO: consider also adding macports paths
if (comptime builtin.target.isDarwin()) {
- if (std.zig.system.darwin.isDarwinSDKInstalled(arena)) sdk: {
- const sdk = std.zig.system.darwin.getDarwinSDK(arena, native_target) orelse break :sdk;
+ if (std.zig.system.darwin.isSdkInstalled(arena)) sdk: {
+ const sdk = std.zig.system.darwin.getSdk(arena, native_target) orelse break :sdk;
try self.addLibDir(try std.fs.path.join(arena, &.{ sdk.path, "usr/lib" }));
try self.addFrameworkDir(try std.fs.path.join(arena, &.{ sdk.path, "System/Library/Frameworks" }));
try self.addIncludeDir(try std.fs.path.join(arena, &.{ sdk.path, "usr/include" }));
diff --git a/lib/std/zig/system/darwin.zig b/lib/std/zig/system/darwin.zig
index e29dc68d64..3857d4f46c 100644
--- a/lib/std/zig/system/darwin.zig
+++ b/lib/std/zig/system/darwin.zig
@@ -11,7 +11,7 @@ pub const macos = @import("darwin/macos.zig");
/// Therefore, we resort to the same tool used by Homebrew, namely, invoking `xcode-select --print-path`
/// and checking if the status is nonzero or the returned string in nonempty.
/// https://github.com/Homebrew/brew/blob/e119bdc571dcb000305411bc1e26678b132afb98/Library/Homebrew/brew.sh#L630
-pub fn isDarwinSDKInstalled(allocator: Allocator) bool {
+pub fn isSdkInstalled(allocator: Allocator) bool {
const argv = &[_][]const u8{ "/usr/bin/xcode-select", "--print-path" };
const result = std.ChildProcess.exec(.{ .allocator = allocator, .argv = argv }) catch return false;
defer {
@@ -29,7 +29,7 @@ pub fn isDarwinSDKInstalled(allocator: Allocator) bool {
/// Calls `xcrun --sdk <target_sdk> --show-sdk-path` which fetches the path to the SDK sysroot (if any).
/// Subsequently calls `xcrun --sdk <target_sdk> --show-sdk-version` which fetches version of the SDK.
/// The caller needs to deinit the resulting struct.
-pub fn getDarwinSDK(allocator: Allocator, target: Target) ?DarwinSDK {
+pub fn getSdk(allocator: Allocator, target: Target) ?Sdk {
const is_simulator_abi = target.abi == .simulator;
const sdk = switch (target.os.tag) {
.macos => "macosx",
@@ -73,7 +73,7 @@ pub fn getDarwinSDK(allocator: Allocator, target: Target) ?DarwinSDK {
};
break :version version;
};
- return DarwinSDK{
+ return Sdk{
.path = path,
.version = version,
};
@@ -96,11 +96,11 @@ fn parseSdkVersion(raw: []const u8) ?Version {
return Version.parse(buffer[0..len]) catch null;
}
-pub const DarwinSDK = struct {
+pub const Sdk = struct {
path: []const u8,
version: Version,
- pub fn deinit(self: DarwinSDK, allocator: Allocator) void {
+ pub fn deinit(self: Sdk, allocator: Allocator) void {
allocator.free(self.path);
}
};