mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-12 14:23:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6220 from laytan/fix-lto-macos

Browse Source 
fix LTO on MacOS
This commit is contained in:
gingerBill
2026-02-02 18:46:18 +00:00
committed by GitHub
parent 6a07f70c1c afbbb829ea
commit f3daaa62fe
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/build_settings.cpp
View File

@@ -1728,6 +1728,29 @@ gb_internal char *token_pos_to_string(TokenPos const &pos) {
return s;
}
gb_internal String normalize_minimum_os_version_string(String version) {
GB_ASSERT(version.len > 0);
gbString normalized = gb_string_make(permanent_allocator(), "");
int granularity = 0;
String_Iterator it = {version, 0};
for (;; granularity++) {
String str = string_split_iterator(&it, '.');
if (str == "") break;
if (granularity > 0) {
normalized = gb_string_appendc(normalized, ".");
}
normalized = gb_string_append_length(normalized, str.text, str.len);
}
for (; granularity < 3; granularity++) {
normalized = gb_string_appendc(normalized, ".0");
}
return make_string_c(normalized);
}
gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subtarget) {
BuildContext *bc = &build_context;
@@ -1997,10 +2020,12 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta
} 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");
bc->minimum_os_version_string = str_lit("17.4.0");
}
}
bc->minimum_os_version_string = normalize_minimum_os_version_string(bc->minimum_os_version_string);
if (subtarget == Subtarget_iPhoneSimulator) {
// For the iPhoneSimulator subtarget, the version must be between 'ios' and '-simulator'.
String suffix = str_lit("-simulator");

4
src/linker.cpp
View File

@@ -978,6 +978,10 @@ try_cross_linking:;
if (build_context.lto_kind != LTO_None) {
link_command_line = gb_string_appendc(link_command_line, " -flto=thin");
link_command_line = gb_string_append_fmt(link_command_line, " -flto-jobs=%d ", build_context.thread_count);
if (is_osx && !build_context.minimum_os_version_string_given) {
link_command_line = gb_string_appendc(link_command_line, " -Wno-override-module ");
}
}
link_command_line = gb_string_appendc(link_command_line, object_files);