diff options
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 24 |
1 files changed, 21 insertions, 3 deletions
@@ -118,6 +118,14 @@ check_prereqs() # Check presence of CMake on the path 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 + 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; + fi + fi + # Check for clang hash clang-$__ClangMajorVersion.$__ClangMinorVersion 2>/dev/null || hash clang$__ClangMajorVersion$__ClangMinorVersion 2>/dev/null || hash clang 2>/dev/null || { echo >&2 "Please install clang-$__ClangMajorVersion.$__ClangMinorVersion before running this script"; exit 1; } @@ -671,6 +679,11 @@ while :; do __ClangMinorVersion=9 ;; + clang4.0) + __ClangMajorVersion=4 + __ClangMinorVersion=0 + ;; + ninja) __UseNinja=1 ;; @@ -732,7 +745,7 @@ while :; do cmakeargs) if [ -n "$2" ]; then - __cmakeargs="$2" + __cmakeargs="$__cmakeargs $2" shift else echo "ERROR: 'cmakeargs' requires a non-empty option argument" @@ -780,8 +793,13 @@ fi # Set default clang version if [[ $__ClangMajorVersion == 0 && $__ClangMinorVersion == 0 ]]; then if [ $__CrossBuild == 1 ]; then - __ClangMajorVersion=3 - __ClangMinorVersion=6 + if [[ "$__BuildArch" == "arm" || "$__BuildArch" == "armel" ]]; then + __ClangMajorVersion=3 + __ClangMinorVersion=9 + else + __ClangMajorVersion=3 + __ClangMinorVersion=6 + fi else __ClangMajorVersion=3 __ClangMinorVersion=5 |