diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-11-14 01:53:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 01:53:14 -0500 |
| commit | 0b0292c4565ebe6267f53d8edcd5fd41270348bb (patch) | |
| tree | a5869d3bc1c32bb77484da2188c3b89c1f3d12c6 | |
| parent | 0184c8d86f614a216641039e06e97f08d439fff7 (diff) | |
| parent | 20e8c2df4ee607d5630abb60aa2724e5f02374cf (diff) | |
| download | zig-0b0292c4565ebe6267f53d8edcd5fd41270348bb.tar.gz zig-0b0292c4565ebe6267f53d8edcd5fd41270348bb.zip | |
Merge pull request #13536 from ziglang/cbe-zig-h
C backend: improve ergonomics of zig.h a little bit
| -rw-r--r-- | lib/zig.h (renamed from lib/include/zig.h) | 2 | ||||
| -rw-r--r-- | src/link/C.zig | 2 | ||||
| -rw-r--r-- | src/main.zig | 4 | ||||
| -rw-r--r-- | src/test.zig | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/lib/include/zig.h b/lib/zig.h index c6df066162..e8329494d4 100644 --- a/lib/include/zig.h +++ b/lib/zig.h @@ -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; diff --git a/src/link/C.zig b/src/link/C.zig index a52ac63df5..4af69e6fcf 100644 --- a/src/link/C.zig +++ b/src/link/C.zig @@ -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. diff --git a/src/main.zig b/src/main.zig index 71325b18d9..d7685af72f 100644 --- a/src/main.zig +++ b/src/main.zig @@ -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"); diff --git a/src/test.zig b/src/test.zig index 41e5f23025..c6d55b806e 100644 --- a/src/test.zig +++ b/src/test.zig @@ -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. |