Set CppCompilerAndLinker for tests

dotnet · Jan 11, 2020 · 88b5f93 · 88b5f93
1 parent 2064d7d
commit 88b5f93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/buildscripts/buildvars-setup.sh b/buildscripts/buildvars-setup.sh
@@ -157,9 +157,6 @@ if [ -z "$__ClangMajorVersion" ] || [ -z "$__ClangMinorVersion" ]; then
     if [ -x "$(command -v clang)" ]; then
         export __ClangMajorVersion="$(echo | clang -dM -E - | grep __clang_major__ | cut -f3 -d ' ')"
         export __ClangMinorVersion="$(echo | clang -dM -E - | grep __clang_minor__ | cut -f3 -d ' ')"
-        if [ "${__HostOS}" != "OSX" ]; then
-            export CppCompilerAndLinker=clang
-        fi
     else
         export __ClangMajorVersion=3
         export __ClangMinorVersion=9

diff --git a/tests/testenv.sh b/tests/testenv.sh
@@ -92,6 +92,11 @@ if [ "$__BuildArch" == "wasm" ]; then
     export CoreRT_BuildOS=WebAssembly
 fi
 
+# Workardound for CI images without clang alias
+if [ "${CoreRT_BuildOS}" == "Linux" ] && [ -z "$CppCompilerAndLinker" ] && [ ! -x "$(command -v clang)" ]; then
+    export CppCompilerAndLinker=clang-3.9
+fi
+
 export CoreRT_BuildArch
 export CoreRT_BuildType
 export CoreRT_BuildOS