authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-04-05 18:55:09-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2018-04-05 18:55:09-04:00
log873641c1232d0442c5924ac5ccb36710bf84d0ce
tree92eb9c02ca411fe50e37bdfa14ce5cc537f03b7e
parent8938429ea12ff2857ace5380932a7cd68d3b4ab1
parent8980281184a5d60098f36f3db605181f08aa1caa
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #899 from bnoordhuis/fix898

fix llvm assert on version string with git sha

1 files changed, 3 insertions(+), 1 deletions(-)

src/codegen.cpp+3-1
...@@ -6207,7 +6207,9 @@ static void init(CodeGen *g) {...@@ -6207,7 +6207,9 @@ static void init(CodeGen *g) {
6207 g->builder = LLVMCreateBuilder();6207 g->builder = LLVMCreateBuilder();
6208 g->dbuilder = ZigLLVMCreateDIBuilder(g->module, true);6208 g->dbuilder = ZigLLVMCreateDIBuilder(g->module, true);
62096209
6210 Buf *producer = buf_sprintf("zig %s", ZIG_VERSION_STRING);6210 // Don't use ZIG_VERSION_STRING here, llvm misparses it when it includes
6211 // the git revision.
6212 Buf *producer = buf_sprintf("zig %d.%d.%d", ZIG_VERSION_MAJOR, ZIG_VERSION_MINOR, ZIG_VERSION_PATCH);
6211 const char *flags = "";6213 const char *flags = "";
6212 unsigned runtime_version = 0;6214 unsigned runtime_version = 0;
6213 ZigLLVMDIFile *compile_unit_file = ZigLLVMCreateFile(g->dbuilder, buf_ptr(g->root_out_name),6215 ZigLLVMDIFile *compile_unit_file = ZigLLVMCreateFile(g->dbuilder, buf_ptr(g->root_out_name),