Skip to content

Commit fc4d53e

Browse files
authored
Merge pull request #17221 from Vexu/aro-translate-c
Aro translate-c
2 parents 0f1652d + 5792570 commit fc4d53e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+70357
-388
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ lib/libcxx/** linguist-vendored
1010
lib/libcxxabi/** linguist-vendored
1111
lib/libunwind/** linguist-vendored
1212
lib/tsan/** linguist-vendored
13+
deps/** linguist-vendored

CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,8 @@ set(BUILD_ZIG2_ARGS
797797
-OReleaseSmall
798798
--name zig2 -femit-bin="${ZIG2_C_SOURCE}"
799799
--mod "build_options::${ZIG_CONFIG_ZIG_OUT}"
800-
--deps build_options
800+
--mod "aro::deps/aro/lib.zig"
801+
--deps build_options,aro
801802
-target "${ZIG_HOST_TARGET_TRIPLE}"
802803
)
803804

build.zig

+3
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,9 @@ fn addCompilerStep(
580580
.optimize = optimize,
581581
});
582582
exe.stack_size = stack_size;
583+
exe.addAnonymousModule("aro", .{
584+
.source_file = .{ .path = "deps/aro/lib.zig" },
585+
});
583586
return exe;
584587
}
585588

0 commit comments

Comments
 (0)