ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-31 20:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/odin-lang/Odin

Browse Source
This commit is contained in:
gingerBill
2022-11-01 14:45:57 +00:00
parent c18e98e8c5 3cd553565f
commit 35331e6973
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build_settings.cpp
+7 -7
View File
@@ -298,17 +298,17 @@ struct BuildContext {
bool ignore_microsoft_magic; bool ignore_microsoft_magic;
bool linker_map_file; bool linker_map_file;
bool use_separate_modules; bool use_separate_modules;
bool threaded_checker; bool threaded_checker;
bool show_debug_messages; bool show_debug_messages;
bool copy_file_contents; bool copy_file_contents;
bool disallow_rtti; bool disallow_rtti;
RelocMode reloc_mode; RelocMode reloc_mode;
bool disable_red_zone; bool disable_red_zone;
u32 cmd_doc_flags; u32 cmd_doc_flags;
@@ -326,7 +326,7 @@ struct BuildContext {
BlockingMutex target_features_mutex; BlockingMutex target_features_mutex;
StringSet target_features_set; StringSet target_features_set;
String target_features_string; String target_features_string;
String minimum_os_version_string;
}; };
gb_global BuildContext build_context = {0}; gb_global BuildContext build_context = {0};
src/main.cpp
+16 -10
View File
@@ -481,9 +481,9 @@ i32 linker_stage(lbGenerator *gen) {
if (build_context.metrics.os == TargetOs_darwin) { if (build_context.metrics.os == TargetOs_darwin) {
// This sets a requirement of Mountain Lion and up, but the compiler doesn't work without this limit. // This sets a requirement of Mountain Lion and up, but the compiler doesn't work without this limit.
// NOTE: If you change this (although this minimum is as low as you can go with Odin working) if (build_context.minimum_os_version_string.len) {
// make sure to also change the 'mtriple' param passed to 'opt' link_settings = gb_string_append_fmt(link_settings, " -mmacosx-version-min=%.*s ", LIT(build_context.minimum_os_version_string));
if (build_context.metrics.arch == TargetArch_arm64) { } else if (build_context.metrics.arch == TargetArch_arm64) {
link_settings = gb_string_appendc(link_settings, " -mmacosx-version-min=12.0.0 "); link_settings = gb_string_appendc(link_settings, " -mmacosx-version-min=12.0.0 ");
} else { } else {
link_settings = gb_string_appendc(link_settings, " -mmacosx-version-min=10.12.0 "); link_settings = gb_string_appendc(link_settings, " -mmacosx-version-min=10.12.0 ");
@@ -624,6 +624,7 @@ enum BuildFlagKind {
BuildFlag_ExtraAssemblerFlags, BuildFlag_ExtraAssemblerFlags,
BuildFlag_Microarch, BuildFlag_Microarch,
BuildFlag_TargetFeatures, BuildFlag_TargetFeatures,
BuildFlag_MinimumOSVersion,
BuildFlag_RelocMode, BuildFlag_RelocMode,
BuildFlag_DisableRedZone, BuildFlag_DisableRedZone,
@@ -797,6 +798,7 @@ bool parse_build_flags(Array<String> args) {
add_flag(&build_flags, BuildFlag_ExtraAssemblerFlags, str_lit("extra-assembler-flags"), BuildFlagParam_String, Command__does_build); add_flag(&build_flags, BuildFlag_ExtraAssemblerFlags, str_lit("extra-assembler-flags"), BuildFlagParam_String, Command__does_build);
add_flag(&build_flags, BuildFlag_Microarch, str_lit("microarch"), BuildFlagParam_String, Command__does_build); add_flag(&build_flags, BuildFlag_Microarch, str_lit("microarch"), BuildFlagParam_String, Command__does_build);
add_flag(&build_flags, BuildFlag_TargetFeatures, str_lit("target-features"), BuildFlagParam_String, Command__does_build); add_flag(&build_flags, BuildFlag_TargetFeatures, str_lit("target-features"), BuildFlagParam_String, Command__does_build);
add_flag(&build_flags, BuildFlag_MinimumOSVersion, str_lit("minimum-os-version"), BuildFlagParam_String, Command__does_build);
add_flag(&build_flags, BuildFlag_RelocMode, str_lit("reloc-mode"), BuildFlagParam_String, Command__does_build); add_flag(&build_flags, BuildFlag_RelocMode, str_lit("reloc-mode"), BuildFlagParam_String, Command__does_build);
add_flag(&build_flags, BuildFlag_DisableRedZone, str_lit("disable-red-zone"), BuildFlagParam_None, Command__does_build); add_flag(&build_flags, BuildFlag_DisableRedZone, str_lit("disable-red-zone"), BuildFlagParam_None, Command__does_build);
@@ -1361,6 +1363,11 @@ bool parse_build_flags(Array<String> args) {
string_to_lower(&build_context.target_features_string); string_to_lower(&build_context.target_features_string);
break; break;
} }
case BuildFlag_MinimumOSVersion: {
GB_ASSERT(value.kind == ExactValue_String);
build_context.minimum_os_version_string = value.value_string;
break;
}
case BuildFlag_RelocMode: { case BuildFlag_RelocMode: {
GB_ASSERT(value.kind == ExactValue_String); GB_ASSERT(value.kind == ExactValue_String);
String v = value.value_string; String v = value.value_string;
@@ -1972,12 +1979,6 @@ void print_show_help(String const arg0, String const &command) {
print_usage_line(2, "Example: -out:foo.exe"); print_usage_line(2, "Example: -out:foo.exe");
print_usage_line(0, ""); print_usage_line(0, "");
print_usage_line(1, "-opt:<integer>");
print_usage_line(2, "Set the optimization level for compilation");
print_usage_line(2, "Accepted values: 0, 1, 2, 3");
print_usage_line(2, "Example: -opt:2");
print_usage_line(0, "");
print_usage_line(1, "-o:<string>"); print_usage_line(1, "-o:<string>");
print_usage_line(2, "Set the optimization mode for compilation"); print_usage_line(2, "Set the optimization mode for compilation");
print_usage_line(2, "Accepted values: minimal, size, speed"); print_usage_line(2, "Accepted values: minimal, size, speed");
@@ -2141,6 +2142,12 @@ void print_show_help(String const arg0, String const &command) {
} }
if (run_or_build) { if (run_or_build) {
print_usage_line(1, "-minimum-os-version:<string>");
print_usage_line(2, "Sets the minimum OS version targeted by the application");
print_usage_line(2, "e.g. -minimum-os-version:12.0.0");
print_usage_line(2, "(Only used when target is Darwin)");
print_usage_line(0, "");
print_usage_line(1, "-extra-linker-flags:<string>"); print_usage_line(1, "-extra-linker-flags:<string>");
print_usage_line(2, "Adds extra linker specific flags in a string"); print_usage_line(2, "Adds extra linker specific flags in a string");
print_usage_line(0, ""); print_usage_line(0, "");
@@ -2149,7 +2156,6 @@ void print_show_help(String const arg0, String const &command) {
print_usage_line(2, "Adds extra assembler specific flags in a string"); print_usage_line(2, "Adds extra assembler specific flags in a string");
print_usage_line(0, ""); print_usage_line(0, "");
print_usage_line(1, "-microarch:<string>"); print_usage_line(1, "-microarch:<string>");
print_usage_line(2, "Specifies the specific micro-architecture for the build in a string"); print_usage_line(2, "Specifies the specific micro-architecture for the build in a string");
print_usage_line(2, "Examples:"); print_usage_line(2, "Examples:");