diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-02-18 22:01:08 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-02-18 22:01:08 -0500 |
| commit | c5ca0fe237e105b95c8edb7f80da899012e573f8 (patch) | |
| tree | 6f8120d2bb3187a90ba5e855c87332386141bf63 /src/all_types.hpp | |
| parent | cbc4e59e6805d27f0e889c0a9ff8488376cea5c0 (diff) | |
| parent | d7968c6d33b054a8293edd89ce248f385e108469 (diff) | |
| download | zig-c5ca0fe237e105b95c8edb7f80da899012e573f8.tar.gz zig-c5ca0fe237e105b95c8edb7f80da899012e573f8.zip | |
Merge branch 'pixelherodev-emit'
Closes #4418
Diffstat (limited to 'src/all_types.hpp')
| -rw-r--r-- | src/all_types.hpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/all_types.hpp b/src/all_types.hpp index fbe24c918b..c1348d3abd 100644 --- a/src/all_types.hpp +++ b/src/all_types.hpp @@ -1966,12 +1966,6 @@ enum CodeModel { CodeModelLarge, }; -enum EmitFileType { - EmitFileTypeBinary, - EmitFileTypeAssembly, - EmitFileTypeLLVMIr, -}; - struct LinkLib { Buf *name; Buf *path; @@ -2142,8 +2136,10 @@ struct CodeGen { Buf llvm_triple_str; Buf global_asm; - Buf output_file_path; Buf o_file_output_path; + Buf bin_file_output_path; + Buf asm_file_output_path; + Buf llvm_ir_file_output_path; Buf *cache_dir; // As an input parameter, mutually exclusive with enable_cache. But it gets // populated in codegen_build_and_link. @@ -2236,7 +2232,6 @@ struct CodeGen { size_t version_patch; const char *linker_script; - EmitFileType emit_file_type; BuildMode build_mode; OutType out_type; const ZigTarget *zig_target; @@ -2258,7 +2253,9 @@ struct CodeGen { bool function_sections; bool enable_dump_analysis; bool enable_doc_generation; - bool disable_bin_generation; + bool emit_bin; + bool emit_asm; + bool emit_llvm_ir; bool test_is_evented; CodeModel code_model; |