diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml index d9a3ed3cf9cfb..686f24bf83d70 100644 --- a/.github/workflows/sycl-linux-build.yml +++ b/.github/workflows/sycl-linux-build.yml @@ -242,14 +242,7 @@ jobs: if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }} # TODO replace utility installation with a single CMake target run: | - cmake --build $GITHUB_WORKSPACE/build --target utils/FileCheck/install - cmake --build $GITHUB_WORKSPACE/build --target utils/count/install - cmake --build $GITHUB_WORKSPACE/build --target utils/not/install - cmake --build $GITHUB_WORKSPACE/build --target utils/lit/install - cmake --build $GITHUB_WORKSPACE/build --target utils/llvm-lit/install - cmake --build $GITHUB_WORKSPACE/build --target install-llvm-size - cmake --build $GITHUB_WORKSPACE/build --target install-llvm-cov - cmake --build $GITHUB_WORKSPACE/build --target install-llvm-profdata + cmake --build $GITHUB_WORKSPACE/build --target install-auxiliary-tools cmake --build $GITHUB_WORKSPACE/build --target install-compiler-rt - name: Additional Install for "--shared-libs" build if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' && contains(inputs.build_configure_extra_args, '--shared-libs') }} diff --git a/.github/workflows/sycl-windows-build.yml b/.github/workflows/sycl-windows-build.yml index dbf4bfd88922c..380991ef49bc8 100644 --- a/.github/workflows/sycl-windows-build.yml +++ b/.github/workflows/sycl-windows-build.yml @@ -185,14 +185,7 @@ jobs: # TODO replace utility installation with a single CMake target run: | cmake --build build --target deploy-sycl-toolchain - cmake --build build --target utils/FileCheck/install - cmake --build build --target utils/count/install - cmake --build build --target utils/not/install - cmake --build build --target utils/lit/install - cmake --build build --target utils/llvm-lit/install - cmake --build build --target install-llvm-size - cmake --build build --target install-llvm-cov - cmake --build build --target install-llvm-profdata + cmake --build build --target install-auxiliary-utils cmake --build build --target install-compiler-rt - name: Pack toolchain if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }} diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt index 78949054ef14c..899bceaaff081 100644 --- a/sycl/CMakeLists.txt +++ b/sycl/CMakeLists.txt @@ -404,6 +404,18 @@ add_custom_target( sycl-toolchain ALL COMMENT "Building SYCL compiler toolchain..." ) +add_custom_target(install-auxiliary-utils + DEPENDS + utils/FileCheck/install + utils/count/install + utils/not/install + utils/lit/install + utils/llvm-lit/install + install-llvm-size + install-llvm-cov + install-llvm-profdata +) + if (WIN32) add_dependencies(sycl-toolchain ur_win_proxy_loader) endif()