diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-02-17 17:20:29 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-02-17 23:42:48 -0700 |
| commit | dd12a7b1e522c43cbbf382acedad063d419694f4 (patch) | |
| tree | 999de4543365c0963882ee3540377c2e98dd8c38 | |
| parent | 6f42876e74831b7f9cecf5a863634df920c52b98 (diff) | |
| download | zig-dd12a7b1e522c43cbbf382acedad063d419694f4.tar.gz zig-dd12a7b1e522c43cbbf382acedad063d419694f4.zip | |
ci: linux: re-use cmake config for finding LLVM
| -rwxr-xr-x | ci/zinc/linux_test.sh | 10 | ||||
| -rw-r--r-- | src/main.zig | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ci/zinc/linux_test.sh b/ci/zinc/linux_test.sh index ec3b3ad977..969e19312e 100755 --- a/ci/zinc/linux_test.sh +++ b/ci/zinc/linux_test.sh @@ -48,7 +48,7 @@ cd $WORKSPACE $ZIG fmt --check . # Build stage2 standalone so that we can test stage2 against stage2 compiler-rt. -$ZIG build -p stage2 -Dstatic-llvm -Duse-zig-libcxx +$ZIG build -p stage2 -Denable-llvm -Duse-zig-libcxx stage2/bin/zig test test/behavior.zig -I test -fLLVM stage2/bin/zig test test/behavior.zig -I test @@ -91,13 +91,13 @@ $ZIG test lib/std/std.zig \ tidy --drop-empty-elements no -qe zig-cache/langref.html # Build release zig. -$ZIG build - --prefix "RELEASE_STAGING" \ +$ZIG build \ + --prefix "$RELEASE_STAGING" \ --search-prefix "$DEPS_LOCAL" \ - -Dstatic-llvm \ + -Denable-llvm \ + -Duse-zig-libcxx \ -Drelease \ -Dstrip \ - -Duse-zig-libcxx \ -Dtarget="$TARGET" \ -Dstage1 diff --git a/src/main.zig b/src/main.zig index 2abcc083a3..248ae2dd76 100644 --- a/src/main.zig +++ b/src/main.zig @@ -2068,6 +2068,8 @@ fn buildOutputType( continue :syslib; } + std.log.scoped(.cli).debug("depending on system for -l{s}", .{lib_name}); + i += 1; } } |