diff options
author | Sergey Andreenko <seandree@microsoft.com> | 2018-04-05 20:09:46 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-05 20:09:46 -0700 |
commit | a96d2fef8edd01f57079f68d92189e1b84378fb8 (patch) | |
tree | 8983f319a5d83c5709b3786d38c080d5720248b4 /build.sh | |
parent | 73e10d266db673368870feedcbefdb945cb7bc25 (diff) | |
download | coreclr-a96d2fef8edd01f57079f68d92189e1b84378fb8.tar.gz coreclr-a96d2fef8edd01f57079f68d92189e1b84378fb8.tar.bz2 coreclr-a96d2fef8edd01f57079f68d92189e1b84378fb8.zip |
Update docker images for arm32 (#17422)
* mark places that we need to change
* update dockumentation for arm
* update build.sh for arm
* update dockers' versions
* fix build.sh
* change default version for arm/armem/arm64
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -150,10 +150,10 @@ check_prereqs() hash cmake 2>/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 +894,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 |