diff options
| author | Jiyoung Giuliana Yun <t2wish@gmail.com> | 2017-04-12 21:11:03 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-04-12 14:11:03 +0200 |
| commit | 2b23f5ec43dea13ad17caa2d6d2883b2a00172e7 (patch) | |
| tree | afb69597cd07c925e015a3e2b54837fb40cb6f1a | |
| parent | 737ae7288bfd1537525b76b01edf21cba868fa9c (diff) | |
| download | coreclr-2b23f5ec43dea13ad17caa2d6d2883b2a00172e7.tar.gz coreclr-2b23f5ec43dea13ad17caa2d6d2883b2a00172e7.tar.bz2 coreclr-2b23f5ec43dea13ad17caa2d6d2883b2a00172e7.zip | |
Change default clang version to clang3.9 in cross build (#10889)
If we use clang3.9 version, we will use O3 option for optimization.
Otherwise, use O1 option as before.
| -rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 10 | ||||
| -rwxr-xr-x | tests/scripts/arm32_ci_script.sh | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index 924a365af9..762a1996b9 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -155,10 +155,14 @@ if [ "$build_arch" == "armel" ]; then cmake_extra_defines="$cmake_extra_defines -DARM_SOFTFP=1" fi -if [ "$build_arch" == "arm" -o "$build_arch" == "armel" ]; then - overridefile=clang-compiler-override-arm.txt +clang_version=$(echo $CC | awk -F- '{ print $NF }') +# Use O1 option when the clang version is smaller than 3.9 +# Otherwise use O3 option in release build +if [[ ( ${clang_version%.*} -eq 3 && ${clang_version#*.} -lt 9 ) && + ( "$build_arch" == "arm" || "$build_arch" == "armel" ) ]]; then + overridefile=clang-compiler-override-arm.txt else - overridefile=clang-compiler-override.txt + overridefile=clang-compiler-override.txt fi cmake \ diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh index 58d1402711..3124cc89ce 100755 --- a/tests/scripts/arm32_ci_script.sh +++ b/tests/scripts/arm32_ci_script.sh @@ -246,13 +246,13 @@ function cross_build_coreclr_with_docker { # TODO: For arm, we are going to embed RootFS inside Docker image. case $__linuxCodeName in trusty) - __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu1404_cross_prereqs_v3" + __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-0cd4667-20172211042239" __skipRootFS=1 __dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/arm" __runtimeOS="ubuntu.14.04" ;; xenial) - __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu1604_cross_prereqs_v3" + __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-ef0ac75-20175511035548" __skipRootFS=1 __dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/arm" __runtimeOS="ubuntu.16.04" @@ -265,7 +265,7 @@ function cross_build_coreclr_with_docker { # For armel Tizen, we are going to construct RootFS on the fly. case $__linuxCodeName in tizen) - __dockerImage=" t2wish/dotnetcore:ubuntu1404_cross_prereqs_v3" + __dockerImage=" t2wish/dotnetcore:ubuntu1404_cross_prereqs_v4" __runtimeOS="tizen.4.0.0" ;; *) @@ -289,7 +289,7 @@ function cross_build_coreclr_with_docker { # Cross building coreclr with rootfs in Docker (set +x; echo "Start cross build coreclr for $__buildArch $__linuxCodeName") - __buildCmd="./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib $__buildConfig -rebuild" + __buildCmd="./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib $__buildConfig -rebuild clang3.9" $__dockerCmd $__buildCmd sudo chown -R $(id -u -n) ./bin } |