diff options
| author | DanielGavin <danielgavin5@hotmail.com> | 2021-11-09 14:30:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 14:30:34 +0100 |
| commit | fbc38c78ebf5cfa96ffe872e6c6f36e8fb8e2bca (patch) | |
| tree | 1e9353cd81d166f53cfc503d9142b347a60963f7 /src/main.cpp | |
| parent | b0db90de96387bfd14b347a1c7736aca443e908d (diff) | |
| parent | eb96f9677ece3c817e755f9f7f24ce0605c06274 (diff) | |
Merge branch 'odin-lang:master' into parser-fix
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; } |