diff options
| author | 2022-12-09 13:46:10 +0100 | |
|---|---|---|
| committer | 2022-12-09 13:46:10 +0100 | |
| commit | 3cfd3cac1dfaa8fd1d6008d92063b1f546f9a6d9 (patch) | |
| tree | d5de4bfbcc866e30972927f630d85e360af8d853 | |
| parent | readme: add a note about the maintenance status (diff) | |
| parent | fix for stage2 (diff) | |
| download | zig-sqlite-3cfd3cac1dfaa8fd1d6008d92063b1f546f9a6d9.tar.gz zig-sqlite-3cfd3cac1dfaa8fd1d6008d92063b1f546f9a6d9.tar.xz zig-sqlite-3cfd3cac1dfaa8fd1d6008d92063b1f546f9a6d9.zip | |
Merge branch 'stage2'
| -rw-r--r-- | build.zig | 3 | ||||
| -rw-r--r-- | query.zig | 2 |
2 files changed, 1 insertions, 4 deletions
| @@ -221,7 +221,6 @@ pub fn build(b: *std.build.Builder) !void { | |||
| 221 | const cross_target = getTarget(test_target.target, bundled); | 221 | const cross_target = getTarget(test_target.target, bundled); |
| 222 | 222 | ||
| 223 | const tests = b.addTest("sqlite.zig"); | 223 | const tests = b.addTest("sqlite.zig"); |
| 224 | tests.use_stage1 = true; | ||
| 225 | 224 | ||
| 226 | if (bundled) { | 225 | if (bundled) { |
| 227 | const lib = b.addStaticLibrary("sqlite", null); | 226 | const lib = b.addStaticLibrary("sqlite", null); |
| @@ -276,7 +275,6 @@ pub fn build(b: *std.build.Builder) !void { | |||
| 276 | fuzz_lib.linkLibrary(lib); | 275 | fuzz_lib.linkLibrary(lib); |
| 277 | fuzz_lib.want_lto = true; | 276 | fuzz_lib.want_lto = true; |
| 278 | fuzz_lib.bundle_compiler_rt = true; | 277 | fuzz_lib.bundle_compiler_rt = true; |
| 279 | fuzz_lib.use_stage1 = true; | ||
| 280 | fuzz_lib.addPackagePath("sqlite", "sqlite.zig"); | 278 | fuzz_lib.addPackagePath("sqlite", "sqlite.zig"); |
| 281 | 279 | ||
| 282 | // Setup the output name | 280 | // Setup the output name |
| @@ -299,7 +297,6 @@ pub fn build(b: *std.build.Builder) !void { | |||
| 299 | 297 | ||
| 300 | // Compile a companion exe for debugging crashes | 298 | // Compile a companion exe for debugging crashes |
| 301 | const fuzz_debug_exe = b.addExecutable("fuzz-debug", "fuzz/main.zig"); | 299 | const fuzz_debug_exe = b.addExecutable("fuzz-debug", "fuzz/main.zig"); |
| 302 | fuzz_debug_exe.use_stage1 = true; | ||
| 303 | fuzz_debug_exe.addIncludePath("c"); | 300 | fuzz_debug_exe.addIncludePath("c"); |
| 304 | fuzz_debug_exe.setBuildMode(mode); | 301 | fuzz_debug_exe.setBuildMode(mode); |
| 305 | fuzz_debug_exe.setTarget(getTarget(target, true)); | 302 | fuzz_debug_exe.setTarget(getTarget(target, true)); |
| @@ -168,7 +168,7 @@ pub fn ParsedQueryState(comptime max_query_len: usize) type { | |||
| 168 | }; | 168 | }; |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | fn ParseType(type_info: []const u8) type { | 171 | fn ParseType(comptime type_info: []const u8) type { |
| 172 | if (type_info.len <= 0) @compileError("invalid type info " ++ type_info); | 172 | if (type_info.len <= 0) @compileError("invalid type info " ++ type_info); |
| 173 | 173 | ||
| 174 | // Integer | 174 | // Integer |