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
4848$ZIG fmt --check .
4949
5050# Build stage2 standalone so that we can test stage2 against stage2 compiler-rt.
51$ZIG build -p stage2 -Dstatic-llvm -Duse-zig-libcxx
51$ZIG build -p stage2 -Denable-llvm -Duse-zig-libcxx
5252
5353stage2/bin/zig test test/behavior.zig -I test -fLLVM
5454stage2/bin/zig test test/behavior.zig -I test
......@@ -91,13 +91,13 @@ $ZIG test lib/std/std.zig \
9191tidy --drop-empty-elements no -qe zig-cache/langref.html
9292
9393# Build release zig.
94$ZIG build
95 --prefix "RELEASE_STAGING" \
94$ZIG build \
95 --prefix "$RELEASE_STAGING" \
9696 --search-prefix "$DEPS_LOCAL" \
97 -Dstatic-llvm \
97 -Denable-llvm \
98 -Duse-zig-libcxx \
9899 -Drelease \
99100 -Dstrip \
100 -Duse-zig-libcxx \
101101 -Dtarget="$TARGET" \
102102 -Dstage1
103103
src/main.zig+2
......@@ -2068,6 +2068,8 @@ fn buildOutputType(
20682068 continue :syslib;
20692069 }
20702070
2071 std.log.scoped(.cli).debug("depending on system for -l{s}", .{lib_name});
2072
20712073 i += 1;
20722074 }
20732075 }