|
@@ -169,6 +169,8 @@ gb_internal i32 linker_stage(LinkerData *gen) {
|
|
|
String section_name = str_lit("msvc-link");
|
|
|
if (build_context.use_lld) {
|
|
|
section_name = str_lit("lld-link");
|
|
|
+ } else if (build_context.use_radlink) {
|
|
|
+ section_name = str_lit("rad-link");
|
|
|
}
|
|
|
timings_start_section(timings, section_name);
|
|
|
|
|
@@ -304,7 +306,45 @@ gb_internal i32 linker_stage(LinkerData *gen) {
|
|
|
String windows_sdk_bin_path = path_to_string(heap_allocator(), build_context.build_paths[BuildPath_Win_SDK_Bin_Path]);
|
|
|
defer (gb_free(heap_allocator(), windows_sdk_bin_path.text));
|
|
|
|
|
|
- if (!build_context.use_lld) { // msvc
|
|
|
+ if (build_context.use_lld) { // lld
|
|
|
+ result = system_exec_command_line_app("msvc-lld-link",
|
|
|
+ "\"%.*s\\bin\\lld-link\" %s -OUT:\"%.*s\" %s "
|
|
|
+ "/nologo /incremental:no /opt:ref /subsystem:%.*s "
|
|
|
+ "%.*s "
|
|
|
+ "%.*s "
|
|
|
+ "%s "
|
|
|
+ "",
|
|
|
+ LIT(build_context.ODIN_ROOT), object_files, LIT(output_filename),
|
|
|
+ link_settings,
|
|
|
+ LIT(build_context.ODIN_WINDOWS_SUBSYSTEM),
|
|
|
+ LIT(build_context.link_flags),
|
|
|
+ LIT(build_context.extra_linker_flags),
|
|
|
+ lib_str
|
|
|
+ );
|
|
|
+
|
|
|
+ if (result) {
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ } else if (build_context.use_radlink) {
|
|
|
+ result = system_exec_command_line_app("msvc-rad-link",
|
|
|
+ "\"%.*s\\bin\\radlink\" %s -OUT:\"%.*s\" %s "
|
|
|
+ "/nologo /incremental:no /opt:ref /subsystem:%.*s "
|
|
|
+ "%.*s "
|
|
|
+ "%.*s "
|
|
|
+ "%s "
|
|
|
+ "",
|
|
|
+ LIT(build_context.ODIN_ROOT), object_files, LIT(output_filename),
|
|
|
+ link_settings,
|
|
|
+ LIT(build_context.ODIN_WINDOWS_SUBSYSTEM),
|
|
|
+ LIT(build_context.link_flags),
|
|
|
+ LIT(build_context.extra_linker_flags),
|
|
|
+ lib_str
|
|
|
+ );
|
|
|
+
|
|
|
+ if (result) {
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ } else { // msvc
|
|
|
String res_path = quote_path(heap_allocator(), build_context.build_paths[BuildPath_RES]);
|
|
|
String rc_path = quote_path(heap_allocator(), build_context.build_paths[BuildPath_RC]);
|
|
|
defer (gb_free(heap_allocator(), res_path.text));
|
|
@@ -362,25 +402,6 @@ gb_internal i32 linker_stage(LinkerData *gen) {
|
|
|
LIT(build_context.extra_linker_flags),
|
|
|
lib_str
|
|
|
);
|
|
|
- if (result) {
|
|
|
- return result;
|
|
|
- }
|
|
|
- } else { // lld
|
|
|
- result = system_exec_command_line_app("msvc-lld-link",
|
|
|
- "\"%.*s\\bin\\lld-link\" %s -OUT:\"%.*s\" %s "
|
|
|
- "/nologo /incremental:no /opt:ref /subsystem:%.*s "
|
|
|
- "%.*s "
|
|
|
- "%.*s "
|
|
|
- "%s "
|
|
|
- "",
|
|
|
- LIT(build_context.ODIN_ROOT), object_files, LIT(output_filename),
|
|
|
- link_settings,
|
|
|
- LIT(build_context.ODIN_WINDOWS_SUBSYSTEM),
|
|
|
- LIT(build_context.link_flags),
|
|
|
- LIT(build_context.extra_linker_flags),
|
|
|
- lib_str
|
|
|
- );
|
|
|
-
|
|
|
if (result) {
|
|
|
return result;
|
|
|
}
|