From 3478c6000976c3b68d6961ba180abc33b4c97c06 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 May 2023 09:18:33 -0400 Subject: [PATCH 1/3] Hardcode the path to libclang from Mariner, not Clang 9 on CentOS 7 --- .../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 d7864c3cdc57a..bbb2386c9b53b 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.12" /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 32fa4e486c22a..9819ba77d5d97 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.12" /p:MonoAOTEnableLLVM=true /p:MonoAOTLLVMUseCxx11Abi=true displayName: "Build Mono LLVM AOT cross compiler" From 3db97ca81218901cc369454f547deb5a0ceca90b Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 May 2023 13:43:57 -0400 Subject: [PATCH 2/3] Update build-runtime-tests-and-send-to-helix.yml --- .../runtimes/build-runtime-tests-and-send-to-helix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bbb2386c9b53b..38a2eb708aead 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/local/lib/libclang.so.12" + /p:MonoLibClang="/usr/local/lib/libclang.so.16" /p:MonoAOTEnableLLVM=true /p:MonoAOTLLVMUseCxx11Abi=true /p:CrossBuild=true From 2c0a7ba7779f5046e7f22276ae8fe5ac3c8e7b6b Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 May 2023 13:44:22 -0400 Subject: [PATCH 3/3] Update run-test-job.yml --- eng/pipelines/common/templates/runtimes/run-test-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 9819ba77d5d97..296ac081a0440 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/local/lib/libclang.so.12" + /p:MonoLibClang="/usr/local/lib/libclang.so.16" /p:MonoAOTEnableLLVM=true /p:MonoAOTLLVMUseCxx11Abi=true displayName: "Build Mono LLVM AOT cross compiler"