mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #13536 from ziglang/cbe-zig-h

Browse source 
C backend: improve ergonomics of zig.h a little bit
This commit is contained in:
Andrew Kelley 2022-11-14 01:53:14 -05:00
parent 33fe7f2881
commit 013d615077
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/include/zig.h → lib/zig.h
View file

@ -220,8 +220,6 @@ typedef uint8_t zig_u8;
typedef int8_t zig_i8;
typedef uint16_t zig_u16;
typedef int16_t zig_i16;
typedef uint16_t zig_u16;
typedef int16_t zig_i16;
typedef uint32_t zig_u32;
typedef int32_t zig_i32;
typedef uint64_t zig_u64;

2
src/link/C.zig
View file

@ -15,7 +15,7 @@ const Air = @import("../Air.zig");
const Liveness = @import("../Liveness.zig");
pub const base_tag: link.File.Tag = .c;
pub const zig_h = "#include <zig.h>\n";
pub const zig_h = "#include \"zig.h\"\n";
base: link.File,
/// This linker backend does not try to incrementally link output C source code.

4
src/main.zig
View file

@ -3021,6 +3021,10 @@ fn buildOutputType(
});
try test_exec_args.append(self_exe_path);
try test_exec_args.append("run");
if (zig_lib_directory.path) |p| {
try test_exec_args.appendSlice(&.{ "-I", p });
}
if (link_libc) try test_exec_args.append("-lc");
if (!mem.eql(u8, target_arch_os_abi, "native")) {
try test_exec_args.append("-target");

3
src/test.zig
View file

@ -1812,6 +1812,9 @@ pub const TestContext = struct {
"-lc",
exe_path,
});
if (zig_lib_directory.path) |p| {
try argv.appendSlice(&.{ "-I", p });
}
} else switch (host.getExternalExecutor(target_info, .{ .link_libc = case.link_libc })) {
.native => try argv.append(exe_path),
.bad_dl, .bad_os_or_cpu => continue :update, // Pass test.