projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c13325f)
Hardcode the path to libclang from Mariner, not Clang 9 on CentOS 7 (#86096)
authorJo Shields <directhex@apebox.org>
Thu, 11 May 2023 20:09:12 +0000 (16:09 -0400)
committerGitHub <noreply@github.com>
Thu, 11 May 2023 20:09:12 +0000 (16:09 -0400)
* Hardcode the path to libclang from Mariner, not Clang 9 on CentOS 7

eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml patch | blob | history
eng/pipelines/common/templates/runtimes/run-test-job.yml patch | blob | history

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 (file)
--- 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 (file)
--- 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"
Domain: Dotnet / Core;