File tree Expand file tree Collapse file tree 2 files changed +8
-1
lines changed
bootstrap/src/core/build_steps
ci/docker/host-x86_64/dist-x86_64-linux Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -460,7 +460,13 @@ impl Step for Llvm {
460460 //FIXME(ZuseZ4): LLVM intends to drop the offload dependency on openmp.
461461 //Remove this line once they achieved it.
462462 enabled_llvm_runtimes. push ( "openmp" ) ;
463- enabled_llvm_projects. push ( "compiler-rt" ) ;
463+ enabled_llvm_runtimes. push ( "compiler-rt" ) ;
464+
465+ let runtime_targets = vec ! [ "default" , "amdgcn-amd-amdhsa" , "nvptx64-nvidia-cuda" ] ;
466+ cfg. define ( "LLVM_RUNTIME_TARGETS" , runtime_targets. join ( ";" ) ) ;
467+
468+ cfg. define ( "RUNTIMES_nvptx64-nvidia-cuda_LLVM_ENABLE_RUNTIMES" , "openmp" ) ;
469+ cfg. define ( "RUNTIMES_amdgcn-amd-amdhsa_LLVM_ENABLE_RUNTIMES" , "openmp" ) ;
464470 }
465471
466472 if !enabled_llvm_projects. is_empty ( ) {
Original file line number Diff line number Diff line change @@ -90,6 +90,7 @@ ENV RUST_CONFIGURE_ARGS \
9090 --set target.x86_64-unknown-linux-gnu.ranlib=/rustroot/bin/llvm-ranlib \
9191 --set llvm.thin-lto=true \
9292 --set llvm.ninja=false \
93+ --set llvm.offload=true \
9394 --set llvm.libzstd=true \
9495 --set rust.jemalloc \
9596 --set rust.bootstrap-override-lld=true \
You can’t perform that action at this time.
0 commit comments