mirror of
https://github.com/Ed94/Odin.git
synced 2026-06-13 01:21:38 -07:00
Allow overriding object extension in -build-mode:obj
This commit is contained in:
+35
-7
@@ -2023,6 +2023,39 @@ gb_internal bool check_target_feature_is_superset_of(String const &superset, Str
|
||||
return true;
|
||||
}
|
||||
|
||||
gb_internal String infer_object_extension_from_build_context() {
|
||||
String output_extension = {};
|
||||
if (is_arch_wasm()) {
|
||||
output_extension = STR_LIT("wasm.o");
|
||||
} else {
|
||||
switch (build_context.metrics.os) {
|
||||
case TargetOs_windows:
|
||||
output_extension = STR_LIT("obj");
|
||||
break;
|
||||
default:
|
||||
case TargetOs_darwin:
|
||||
case TargetOs_linux:
|
||||
case TargetOs_essence:
|
||||
output_extension = STR_LIT("o");
|
||||
break;
|
||||
|
||||
case TargetOs_freestanding:
|
||||
switch (build_context.metrics.abi) {
|
||||
default:
|
||||
case TargetABI_Default:
|
||||
case TargetABI_SysV:
|
||||
output_extension = STR_LIT("o");
|
||||
break;
|
||||
case TargetABI_Win64:
|
||||
output_extension = STR_LIT("obj");
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
return output_extension;
|
||||
}
|
||||
|
||||
// NOTE(Jeroen): Set/create the output and other paths and report an error as appropriate.
|
||||
// We've previously called `parse_build_flags`, so `out_filepath` should be set.
|
||||
gb_internal bool init_build_paths(String init_filename) {
|
||||
@@ -2155,13 +2188,8 @@ gb_internal bool init_build_paths(String init_filename) {
|
||||
if (build_context.metrics.os == TargetOs_windows) {
|
||||
output_extension = STR_LIT("lib");
|
||||
}
|
||||
}else if (build_context.build_mode == BuildMode_Object) {
|
||||
// By default use a .o object extension.
|
||||
output_extension = STR_LIT("o");
|
||||
|
||||
if (build_context.metrics.os == TargetOs_windows) {
|
||||
output_extension = STR_LIT("obj");
|
||||
}
|
||||
} else if (build_context.build_mode == BuildMode_Object) {
|
||||
output_extension = infer_object_extension_from_build_context();
|
||||
} else if (build_context.build_mode == BuildMode_Assembly) {
|
||||
// By default use a .S asm extension.
|
||||
output_extension = STR_LIT("S");
|
||||
|
||||
+6
-29
@@ -2527,38 +2527,15 @@ gb_internal String lb_filepath_obj_for_module(lbModule *m) {
|
||||
String ext = {};
|
||||
|
||||
if (build_context.build_mode == BuildMode_Assembly) {
|
||||
ext = STR_LIT(".S");
|
||||
ext = STR_LIT("S");
|
||||
} else if (build_context.build_mode == BuildMode_Object) {
|
||||
// Allow a user override for the object extension.
|
||||
ext = build_context.build_paths[BuildPath_Output].ext;
|
||||
} else {
|
||||
if (is_arch_wasm()) {
|
||||
ext = STR_LIT(".wasm.o");
|
||||
} else {
|
||||
switch (build_context.metrics.os) {
|
||||
case TargetOs_windows:
|
||||
ext = STR_LIT(".obj");
|
||||
break;
|
||||
default:
|
||||
case TargetOs_darwin:
|
||||
case TargetOs_linux:
|
||||
case TargetOs_essence:
|
||||
ext = STR_LIT(".o");
|
||||
break;
|
||||
|
||||
case TargetOs_freestanding:
|
||||
switch (build_context.metrics.abi) {
|
||||
default:
|
||||
case TargetABI_Default:
|
||||
case TargetABI_SysV:
|
||||
ext = STR_LIT(".o");
|
||||
break;
|
||||
case TargetABI_Win64:
|
||||
ext = STR_LIT(".obj");
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
ext = infer_object_extension_from_build_context();
|
||||
}
|
||||
|
||||
path = gb_string_append_length(path, ".", 1);
|
||||
path = gb_string_append_length(path, ext.text, ext.len);
|
||||
|
||||
return make_string(cast(u8 *)path, gb_string_length(path));
|
||||
|
||||
Reference in New Issue
Block a user