aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHarold Brenes <harold@hbrenes.com>2025-07-14 21:55:28 -0400
committerHarold Brenes <harold@hbrenes.com>2025-07-14 21:55:28 -0400
commitbab4ce11fc1d52e2a63ed950fcf3cb0510cbe642 (patch)
treea217ccedae7c347449d47b58711266d97b41001a /src
parent67c90b5d9e321910632716a2ebb0bb97964020b1 (diff)
Rename `iOS` subtarget to `iPhone` for consistency.
Add `ODIN_PLATFORM_SUBTARGET_IOS` builtin constant which evaluated to `true` when the platform is `Darwin` and the subtarget it either `iPhone` or `iPhoneSimulator`
Diffstat (limited to 'src')
-rw-r--r--src/build_settings.cpp10
-rw-r--r--src/checker.cpp2
-rw-r--r--src/linker.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index d98340844..46e7ecb4e 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -171,7 +171,7 @@ struct TargetMetrics {
enum Subtarget : u32 {
Subtarget_Default,
- Subtarget_iOS,
+ Subtarget_iPhone,
Subtarget_iPhoneSimulator,
Subtarget_Android,
@@ -180,7 +180,7 @@ enum Subtarget : u32 {
gb_global String subtarget_strings[Subtarget_COUNT] = {
str_lit(""),
- str_lit("ios"),
+ str_lit("iphone"),
str_lit("iphonesimulator"),
str_lit("android"),
};
@@ -1828,7 +1828,7 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta
if (metrics->os == TargetOs_darwin) {
switch (subtarget) {
- case Subtarget_iOS:
+ case Subtarget_iPhone:
switch (metrics->arch) {
case TargetArch_arm64:
bc->metrics.target_triplet = str_lit("arm64-apple-ios");
@@ -1909,7 +1909,7 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta
if (!bc->minimum_os_version_string_given) {
if (subtarget == Subtarget_Default) {
bc->minimum_os_version_string = str_lit("11.0.0");
- } else if (subtarget == Subtarget_iOS || subtarget == Subtarget_iPhoneSimulator) {
+ } else if (subtarget == Subtarget_iPhone || subtarget == Subtarget_iPhoneSimulator) {
// NOTE(harold): We default to 17.4 on iOS because that's when os_sync_wait_on_address was added and
// we'd like to avoid any potential App Store issues by using the private ulock_* there.
bc->minimum_os_version_string = str_lit("17.4");
@@ -1917,7 +1917,7 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta
}
if (subtarget == Subtarget_iPhoneSimulator) {
- // For the iOS simulator subtarget, the version must be between 'ios' and '-simulator'.
+ // For the iPhoneSimulator subtarget, the version must be between 'ios' and '-simulator'.
String suffix = str_lit("-simulator");
GB_ASSERT(string_ends_with(bc->metrics.target_triplet, suffix));
diff --git a/src/checker.cpp b/src/checker.cpp
index 625536caa..1821cbd4d 100644
--- a/src/checker.cpp
+++ b/src/checker.cpp
@@ -1172,7 +1172,7 @@ gb_internal void init_universal(void) {
{
GlobalEnumValue values[Subtarget_COUNT] = {
{"Default", Subtarget_Default},
- {"iOS", Subtarget_iOS},
+ {"iPhone", Subtarget_iPhone},
{"iPhoneSimulator", Subtarget_iPhoneSimulator},
{"Android", Subtarget_Android},
};
diff --git a/src/linker.cpp b/src/linker.cpp
index 7647ed872..41333a3c9 100644
--- a/src/linker.cpp
+++ b/src/linker.cpp
@@ -787,7 +787,7 @@ try_cross_linking:;
// being set to 'MacOSX' even though we've set the sysroot to the correct SDK (-Wincompatible-sysroot).
// This is because it is likely not using the SDK's toolchain Apple Clang but another one installed in the system.
switch (selected_subtarget) {
- case Subtarget_iOS:
+ case Subtarget_iPhone:
darwin_platform_name = "iPhoneOS";
darwin_xcrun_sdk_name = "iphoneos";
darwin_min_version_id = "ios";