diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-06-11 10:08:07 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-09-04 08:29:01 +0000 |
commit | 7d0c343fc67d00c32ceb2fa84ec6546c0ddd3165 (patch) | |
tree | ddcb08cb0a8b836e3ae47acb8c0b9e8f54ddf105 /coin/provisioning/common/unix | |
parent | 413fcafc149328bdfa15913a1746162891dda5a2 (diff) |
Cleanup of RHEL 6 codes from provisioning scripts
RHEL 6 has been removed in 5.12+ verifications, so no need
to maintain those changes.
Change-Id: Ie65120bf8ec7a7d0aaa71b7c28e95283263e62eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/common/unix')
-rwxr-xr-x | coin/provisioning/common/unix/libclang.sh | 14 | ||||
-rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 2 |
2 files changed, 4 insertions, 12 deletions
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 645cf6ec..a9d1cc49 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -48,18 +48,12 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" source "${BASH_SOURCE%/*}/DownloadURL.sh" libclang_version=6.0 -libclang_version_Rhel6=4.0 if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-mac.7z" url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z" sha1="0af8ab8c1174faf4b721d079587190fc32ea8364" -elif uname -a |grep -q "el6"; then - version=$libclang_version_Rhel6 - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" - url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" - sha1="c7466109628418a6aa3db8b3f5825f847f1c4952" else version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" @@ -79,8 +73,6 @@ sudo mv /tmp/libclang "$destination" echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile echo "libClang = $version" >> ~/versions.txt -if [ "$version" == "6.0" ]; then - # This is a hacked static build of libclang which requires special - # handling on the qdoc side. - SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1" -fi +# This is a hacked static build of libclang which requires special +# handling on the qdoc side. +SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1" diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b46a9d8d..cf1468c6 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -76,7 +76,7 @@ function MountAndInstall { usersGroup="staff" mountFolder="/Volumes" squishLicenseDir="/Users/qt" - elif uname -a |grep -q "el6\|el7"; then + elif uname -a |grep -q "el7"; then usersGroup="qt" mountFolder="/tmp" squishLicenseDir="/root" |