Skip to content

Commit 9df6307

Browse files
committed
make sure FileCheck is copied in the LLVM output directory
The tool, which is needed by parts of our test suite, is built as part of LLVM but is *not* copied to the directory containing the output LLVM binaries. This adds a flag to ensure the binary is copied. This shouldn't add any extra built time, as the flag just installs extra binaries that were already compiled.
1 parent 20997f6 commit 9df6307

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/bootstrap/native.rs

+5
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@ impl Step for Llvm {
189189
.define("LLVM_TARGET_ARCH", target_native.split('-').next().unwrap())
190190
.define("LLVM_DEFAULT_TARGET_TRIPLE", target_native);
191191

192+
// Parts of our test suite rely on the `FileCheck` tool, which is built by default in
193+
// `build/$TARGET/llvm/build/bin` is but *not* then installed to `build/$TARGET/llvm/bin`.
194+
// This flag makes sure `FileCheck` is copied in the final binaries directory.
195+
cfg.define("LLVM_INSTALL_UTILS", "ON");
196+
192197
if builder.config.llvm_profile_generate {
193198
cfg.define("LLVM_BUILD_INSTRUMENTED", "IR");
194199
cfg.define("LLVM_BUILD_RUNTIME", "No");

0 commit comments

Comments
 (0)