authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-02-17 17:20:29-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-02-17 23:42:48-07:00
logdd12a7b1e522c43cbbf382acedad063d419694f4
tree999de4543365c0963882ee3540377c2e98dd8c38
parent6f42876e74831b7f9cecf5a863634df920c52b98

ci: linux: re-use cmake config for finding LLVM

2 files changed, 7 insertions(+), 5 deletions(-)

ci/zinc/linux_test.sh+5-5
...@@ -48,7 +48,7 @@ cd $WORKSPACE...@@ -48,7 +48,7 @@ cd $WORKSPACE
48$ZIG fmt --check .48$ZIG fmt --check .
4949
50# Build stage2 standalone so that we can test stage2 against stage2 compiler-rt.50# Build stage2 standalone so that we can test stage2 against stage2 compiler-rt.
51$ZIG build -p stage2 -Dstatic-llvm -Duse-zig-libcxx51$ZIG build -p stage2 -Denable-llvm -Duse-zig-libcxx
5252
53stage2/bin/zig test test/behavior.zig -I test -fLLVM53stage2/bin/zig test test/behavior.zig -I test -fLLVM
54stage2/bin/zig test test/behavior.zig -I test54stage2/bin/zig test test/behavior.zig -I test
...@@ -91,13 +91,13 @@ $ZIG test lib/std/std.zig \...@@ -91,13 +91,13 @@ $ZIG test lib/std/std.zig \
91tidy --drop-empty-elements no -qe zig-cache/langref.html91tidy --drop-empty-elements no -qe zig-cache/langref.html
9292
93# Build release zig.93# Build release zig.
94$ZIG build94$ZIG build \
95 --prefix "RELEASE_STAGING" \95 --prefix "$RELEASE_STAGING" \
96 --search-prefix "$DEPS_LOCAL" \96 --search-prefix "$DEPS_LOCAL" \
97 -Dstatic-llvm \97 -Denable-llvm \
98 -Duse-zig-libcxx \
98 -Drelease \99 -Drelease \
99 -Dstrip \100 -Dstrip \
100 -Duse-zig-libcxx \
101 -Dtarget="$TARGET" \101 -Dtarget="$TARGET" \
102 -Dstage1102 -Dstage1
103103
src/main.zig+2
...@@ -2068,6 +2068,8 @@ fn buildOutputType(...@@ -2068,6 +2068,8 @@ fn buildOutputType(
2068 continue :syslib;2068 continue :syslib;
2069 }2069 }
20702070
2071 std.log.scoped(.cli).debug("depending on system for -l{s}", .{lib_name});
2072
2071 i += 1;2073 i += 1;
2072 }2074 }
2073 }2075 }