diff --git a/.github/workflows/buildAndTestRyzenAI.yml b/.github/workflows/buildAndTestRyzenAI.yml index 3d80cb7cd..d659973db 100644 --- a/.github/workflows/buildAndTestRyzenAI.yml +++ b/.github/workflows/buildAndTestRyzenAI.yml @@ -74,6 +74,9 @@ jobs: -DCMAKE_BUILD_TYPE=Debug \ -DPython3_EXECUTABLE=$(which python) \ -DCMAKE_INSTALL_PREFIX=$PWD/../install \ + -DCMAKE_C_COMPILER=clang-15 \ + -DCMAKE_CXX_COMPILER=clang++-15 \ + -DCMAKE_ASM_COMPILER=clang-15 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" \ @@ -107,6 +110,9 @@ jobs: -DLLVM_ENABLE_ASSERTIONS=ON \ -DPython3_EXECUTABLE=$(which python) \ -DCMAKE_INSTALL_PREFIX=$PWD/../install \ + -DCMAKE_C_COMPILER=clang-15 \ + -DCMAKE_CXX_COMPILER=clang++-15 \ + -DCMAKE_ASM_COMPILER=clang-15 \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" \ diff --git a/utils/github-build-llvm.sh b/utils/github-build-llvm.sh index 29e634d6c..8d3c6e77f 100755 --- a/utils/github-build-llvm.sh +++ b/utils/github-build-llvm.sh @@ -20,6 +20,9 @@ mkdir -p llvm/$INSTALL_DIR pushd llvm/$BUILD_DIR cmake ../llvm \ -GNinja \ + -DCMAKE_C_COMPILER=clang-15 \ + -DCMAKE_CXX_COMPILER=clang++-15 \ + -DCMAKE_ASM_COMPILER=clang-15 \ -DLLVM_BUILD_EXAMPLES=OFF \ -DLLVM_TARGETS_TO_BUILD="host" \ -DCMAKE_INSTALL_PREFIX=../$INSTALL_DIR \ @@ -31,9 +34,7 @@ cmake ../llvm \ -DLLVM_CCACHE_BUILD=ON \ -DLLVM_ENABLE_LLD=ON \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_VISIBILITY_INLINES_HIDDEN=ON \ - -DCMAKE_C_VISIBILITY_PRESET=hidden \ - -DCMAKE_CXX_VISIBILITY_PRESET=hidden \ + -DLLVM_ENABLE_RTTI=ON \ -DLLVM_ENABLE_ASSERTIONS=ON cmake --build . --target install -- -j$(nproc)