From: Geunsik Lim Date: Wed, 18 May 2016 02:44:23 +0000 (+0900) Subject: Linux/ARM: Change default clang version from 3.5 to 3.6 (#4928) X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f39cef776f14ca0c4004e384bd4f331f07fe3e69;p=platform%2Fupstream%2Fcoreclr.git Linux/ARM: Change default clang version from 3.5 to 3.6 (#4928) In case of the cross compilation on the ubuntu 14.04 x64 for Linux/ARM, the default version of clang/llvm that is generated by "#> sudo ./cross/build-rootfs.sh arm" command is 3.6 without 3.5 as following: u14.04@x64> ls ./coreclr/cross/rootfs/arm/usr/lib/clang/3.6 include lib u14.04@x64> ls ./coreclr/cross/rootfs/arm/usr/lib/llvm-3.6/ bin build include lib share Let's keep the clang/llvm version consistently by moving the default version from 'clang3.5' to 'clang3.6' at build-time for Linux/ARM. Signed-off-by: Geunsik Lim --- diff --git a/build.sh b/build.sh index 9dcc742e7c..aa10a992b7 100755 --- a/build.sh +++ b/build.sh @@ -449,8 +449,8 @@ __CleanBuild=0 __VerboseBuild=0 __SignTypeReal="" __CrossBuild=0 -__ClangMajorVersion=3 -__ClangMinorVersion=5 +__ClangMajorVersion=0 +__ClangMinorVersion=0 __MSBuildPath=$__ProjectRoot/Tools/MSBuild.exe __NuGetPath="$__PackagesDir/NuGet.exe" __DistroName="" @@ -628,6 +628,17 @@ while :; do shift done +# Set default clang version +if [[ $__ClangMajorVersion == 0 && $__ClangMinorVersion == 0 ]]; then + if [ $__CrossBuild == 1 ]; then + __ClangMajorVersion=3 + __ClangMinorVersion=6 + else + __ClangMajorVersion=3 + __ClangMinorVersion=5 + fi +fi + # Set dependent variables __LogsDir="$__RootBinDir/Logs"