X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build.sh;h=701c6315280ef9f1483dff77110b3cf56f5fef65;hb=b8f0c4b81c85b75f4a1241a289f179f400453664;hp=d43a7908dfc6b2b0b74f68b8dd940f7f1141d90a;hpb=4942bb10b3a7507c777e84f9b0f8770a99c982da;p=platform%2Fupstream%2Fcoreclr.git diff --git a/build.sh b/build.sh index d43a790..701c631 100755 --- a/build.sh +++ b/build.sh @@ -66,11 +66,14 @@ initHostDistroRid() if [ "$__HostOS" == "Linux" ]; then if [ -e /etc/os-release ]; then source /etc/os-release - if [[ $ID == "alpine" || $ID == "rhel" ]]; then + if [[ $ID == "rhel" ]]; then # remove the last version digit VERSION_ID=${VERSION_ID%.*} fi __HostDistroRid="$ID.$VERSION_ID-$__HostArch" + if [[ $ID == "alpine" ]]; then + __HostDistroRid="linux-musl-$__HostArch" + fi elif [ -e /etc/redhat-release ]; then local redhatRelease=$(/dev/null || { echo >&2 "Please install cmake before running this script"; exit 1; } - # Minimum required version of clang is version 3.9 for arm/armel cross build + # Minimum required version of clang is version 4.0 for arm/armel cross build if [[ $__CrossBuild == 1 && ("$__BuildArch" == "arm" || "$__BuildArch" == "armel") ]]; then - if ! [[ "$__ClangMajorVersion" -gt "3" || ( $__ClangMajorVersion == 3 && $__ClangMinorVersion == 9 ) ]]; then - echo "Please install clang3.9 or latest for arm/armel cross build"; exit 1; + if ! [[ "$__ClangMajorVersion" -ge "4" ]]; then + echo "Please install clang4.0 or latest for arm/armel cross build"; exit 1; fi fi @@ -894,8 +897,13 @@ fi # Set default clang version if [[ $__ClangMajorVersion == 0 && $__ClangMinorVersion == 0 ]]; then - __ClangMajorVersion=3 - __ClangMinorVersion=9 + if [[ "$__BuildArch" == "arm" || "$__BuildArch" == "armel" ]]; then + __ClangMajorVersion=5 + __ClangMinorVersion=0 + else + __ClangMajorVersion=3 + __ClangMinorVersion=9 + fi fi if [[ "$__BuildArch" == "armel" ]]; then