Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,11 @@ pub fn build(b: *std.Build) !void {
fn buildExample(b: *std.Build, i: BuildInfo) void {
const exe = b.addExecutable(.{
.name = i.filename(),
.root_source_file = b.path(i.filepath),
.target = i.target,
.optimize = i.optimize,
.root_module = b.createModule(.{
.root_source_file = b.path(i.filepath),
.target = i.target,
.optimize = i.optimize,
})
});
exe.root_module.addImport("llvm", b.modules.get("llvm").?);

Expand Down Expand Up @@ -119,16 +121,20 @@ fn buildTests(b: *std.Build, target: std.Build.ResolvedTarget) void {
.mode = .simple,
};
const llvm_tests = b.addTest(.{
.root_source_file = b.path("src/llvm-bindings.zig"),
.target = target,
.optimize = .Debug,
.root_module = b.createModule(.{
.root_source_file = b.path("src/llvm-bindings.zig"),
.target = target,
.optimize = .Debug,
}),
.name = "llvm-tests",
.test_runner = custom_test_runner,
});
const clang_tests = b.addTest(.{
.root_source_file = b.path("src/clang.zig"),
.target = target,
.optimize = .Debug,
.root_module = b.createModule(.{
.root_source_file = b.path("src/clang.zig"),
.target = target,
.optimize = .Debug,
}),
.name = "clang-tests",
.test_runner = custom_test_runner,
});
Expand Down
6 changes: 3 additions & 3 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
.version = "1.0.0",
.dependencies = .{
.test_runner = .{
.url = "git+https://gist.github.com/karlseguin/c6bea5b35e4e8d26af6f81c22cb5d76b#1f317ebc9cd09bc50fd5591d09c34255e15d1d85",
.hash = "N-V-__8AANwlAADW-4Yu_sYSZkL_6wcz13gOf9pkOLCjct-F",
.url = "git+https://gist.github.com/karlseguin/c6bea5b35e4e8d26af6f81c22cb5d76b#eb15512d6ae49663fa9df6c7a9725b20dab43edd",
.hash = "N-V-__8AAHMkAAC4CUVVTX0UMBJXtfOubskbF9EJ7X6qAGYR",
},
},
.minimum_zig_version = "0.14.0",
.minimum_zig_version = "0.15.1",
.fingerprint = 0xbf48c74bc4247821,
.paths = .{
"src",
Expand Down
20 changes: 10 additions & 10 deletions src/target.zig
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pub extern fn LLVMInitializeWebAssemblyDisassembler() void;
pub extern fn LLVMInitializeX86Disassembler() void;
pub extern fn LLVMInitializeXCoreDisassembler() void;

pub fn LLVMInitializeAllTargetInfos() callconv(.C) void {
pub fn LLVMInitializeAllTargetInfos() callconv(.c) void {
LLVMInitializeAArch64TargetInfo();
LLVMInitializeAMDGPUTargetInfo();
LLVMInitializeARMTargetInfo();
Expand All @@ -131,7 +131,7 @@ pub fn LLVMInitializeAllTargetInfos() callconv(.C) void {
LLVMInitializeXCoreTargetInfo();
LLVMInitializeVETargetInfo();
}
pub fn LLVMInitializeAllTargets() callconv(.C) void {
pub fn LLVMInitializeAllTargets() callconv(.c) void {
LLVMInitializeAArch64Target();
LLVMInitializeAMDGPUTarget();
LLVMInitializeARMTarget();
Expand All @@ -151,7 +151,7 @@ pub fn LLVMInitializeAllTargets() callconv(.C) void {
LLVMInitializeXCoreTarget();
LLVMInitializeVETarget();
}
pub fn LLVMInitializeAllTargetMCs() callconv(.C) void {
pub fn LLVMInitializeAllTargetMCs() callconv(.c) void {
LLVMInitializeAArch64TargetMC();
LLVMInitializeAMDGPUTargetMC();
LLVMInitializeARMTargetMC();
Expand All @@ -171,7 +171,7 @@ pub fn LLVMInitializeAllTargetMCs() callconv(.C) void {
LLVMInitializeXCoreTargetMC();
LLVMInitializeVETargetMC();
}
pub fn LLVMInitializeAllAsmPrinters() callconv(.C) void {
pub fn LLVMInitializeAllAsmPrinters() callconv(.c) void {
LLVMInitializeAArch64AsmPrinter();
LLVMInitializeAMDGPUAsmPrinter();
LLVMInitializeARMAsmPrinter();
Expand All @@ -191,7 +191,7 @@ pub fn LLVMInitializeAllAsmPrinters() callconv(.C) void {
LLVMInitializeXCoreAsmPrinter();
LLVMInitializeVEAsmPrinter();
}
pub fn LLVMInitializeAllAsmParsers() callconv(.C) void {
pub fn LLVMInitializeAllAsmParsers() callconv(.c) void {
LLVMInitializeAArch64AsmParser();
LLVMInitializeAMDGPUAsmParser();
LLVMInitializeARMAsmParser();
Expand All @@ -209,7 +209,7 @@ pub fn LLVMInitializeAllAsmParsers() callconv(.C) void {
LLVMInitializeX86AsmParser();
LLVMInitializeVEAsmParser();
}
pub fn LLVMInitializeAllDisassemblers() callconv(.C) void {
pub fn LLVMInitializeAllDisassemblers() callconv(.c) void {
LLVMInitializeAArch64Disassembler();
LLVMInitializeAMDGPUDisassembler();
LLVMInitializeARMDisassembler();
Expand All @@ -228,21 +228,21 @@ pub fn LLVMInitializeAllDisassemblers() callconv(.C) void {
LLVMInitializeXCoreDisassembler();
LLVMInitializeVEDisassembler();
}
pub fn LLVMInitializeNativeTarget() callconv(.C) LLVMtype.LLVMBool {
pub fn LLVMInitializeNativeTarget() callconv(.c) LLVMtype.LLVMBool {
LLVMInitializeX86TargetInfo();
LLVMInitializeX86Target();
LLVMInitializeX86TargetMC();
return 0;
}
pub fn LLVMInitializeNativeAsmParser() callconv(.C) LLVMtype.LLVMBool {
pub fn LLVMInitializeNativeAsmParser() callconv(.c) LLVMtype.LLVMBool {
LLVMInitializeX86AsmParser();
return 0;
}
pub fn LLVMInitializeNativeAsmPrinter() callconv(.C) LLVMtype.LLVMBool {
pub fn LLVMInitializeNativeAsmPrinter() callconv(.c) LLVMtype.LLVMBool {
LLVMInitializeX86AsmPrinter();
return 0;
}
pub fn LLVMInitializeNativeDisassembler() callconv(.C) LLVMtype.LLVMBool {
pub fn LLVMInitializeNativeDisassembler() callconv(.c) LLVMtype.LLVMBool {
LLVMInitializeX86Disassembler();
return 0;
}
Expand Down