From da2cf17084c837d5c14fba173b5aed5c911a4fa1 Mon Sep 17 00:00:00 2001 From: Tom Deseyn Date: Tue, 17 May 2022 18:34:49 +0200 Subject: [PATCH] Add clang 14 to known compiler versions. (#69249) * Add clang 14 to known compiler versions. * NativeExports: strip 'unknown compiler' and other stderr output when determining compiler path. --- eng/common/native/init-compiler.sh | 2 +- .../tests/TestAssets/NativeExports/NativeExports.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 6d7ba15e5f2b5..4b99a9cad3b77 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then # Set default versions if [[ -z "$majorVersion" ]]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [[ "$compiler" == "clang" ]]; then versions=( 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj index 2137affaa095e..d420161d1a6eb 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj @@ -29,7 +29,7 @@ clang -