diff options
| author | gingerBill <bill@gingerbill.org> | 2021-11-09 18:06:19 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2021-11-09 18:06:19 +0000 |
| commit | 321d93bff1c3ee1ac2658e706df575fb661e0b9b (patch) | |
| tree | a0cf9bb1c4edd0e348c073e5966af0e1ab34e7ec /src/main.cpp | |
| parent | c63f4d68c8ffd5f94e933cec14eccdb986d20a1d (diff) | |
| parent | 600d19c51b9c1cbf6ecf5bd9f9def15d4780c661 (diff) | |
Merge branch 'master' into target-js_wasm32
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 3fed50c80..c8af38211 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -137,11 +137,17 @@ i32 linker_stage(lbGenerator *gen) { if (is_arch_wasm()) { timings_start_section(timings, str_lit("wasm-ld")); - + + #if defined(GB_SYSTEM_WINDOWS) result = system_exec_command_line_app("wasm-ld", "\"%.*s\\bin\\wasm-ld\" \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", LIT(build_context.ODIN_ROOT), LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); + #else + result = system_exec_command_line_app("wasm-ld", + "wasm-ld \"%.*s.wasm.o\" -o \"%.*s.wasm\" %.*s %.*s", + LIT(output_base), LIT(output_base), LIT(build_context.link_flags), LIT(build_context.extra_linker_flags)); + #endif return result; } |