diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2021-07-22 09:34:44 +0200 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2021-07-22 09:34:44 +0200 |
| commit | def135918740846d9b206c3188563cb77333f3a9 (patch) | |
| tree | 2d054e8bca8b70ab2d38e384ff4eaac665b86422 /src/main.zig | |
| parent | d0edd37f690c3e6cf3f8a7fc7a27016ba9b010ce (diff) | |
| parent | 8d0671157cdf8bc8b89d047138b42227420a5388 (diff) | |
| download | zig-def135918740846d9b206c3188563cb77333f3a9.tar.gz zig-def135918740846d9b206c3188563cb77333f3a9.zip | |
Merge remote-tracking branch 'origin/master' into zld-incremental-2
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main.zig b/src/main.zig index ae39b9c167..239159c4f5 100644 --- a/src/main.zig +++ b/src/main.zig @@ -365,6 +365,7 @@ const usage_build_generic = \\ coff Common Object File Format (Windows) \\ macho macOS relocatables \\ spirv Standard, Portable Intermediate Representation V (SPIR-V) + \\ plan9 Plan 9 from Bell Labs object format \\ hex (planned) Intel IHEX \\ raw (planned) Dump machine code directly \\ -dirafter [dir] Add directory to AFTER include search path |