From c7eeb3380aa999b7d91b90864b98e8c393827a61 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 May 2023 16:09:12 -0400 Subject: [PATCH] Hardcode the path to libclang from Mariner, not Clang 9 on CentOS 7 (#86096) * Hardcode the path to libclang from Mariner, not Clang 9 on CentOS 7 --- .../common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml | 2 +- eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml index d7864c3..38a2eb7 100644 --- a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml +++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml @@ -46,7 +46,7 @@ steps: -arch ${{ parameters.archType }} /p:BuildMonoAotCrossCompiler=true /p:BuildMonoAotCrossCompilerOnly=true - /p:MonoLibClang="/usr/lib/llvm-9/lib/libclang-9.so.1" + /p:MonoLibClang="/usr/local/lib/libclang.so.16" /p:MonoAOTEnableLLVM=true /p:MonoAOTLLVMUseCxx11Abi=true /p:CrossBuild=true diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 32fa4e4..296ac08 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -291,7 +291,7 @@ jobs: -arch $(archType) /p:BuildMonoAotCrossCompiler=true /p:BuildMonoAotCrossCompilerOnly=true - /p:MonoLibClang="/usr/lib/llvm-9/lib/libclang-9.so.1" + /p:MonoLibClang="/usr/local/lib/libclang.so.16" /p:MonoAOTEnableLLVM=true /p:MonoAOTLLVMUseCxx11Abi=true displayName: "Build Mono LLVM AOT cross compiler" -- 2.7.4