From 6039c16bbb4a0e740888e8dde52645fa74f433d3 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 20 Jun 2016 10:02:48 -0700 Subject: [PATCH 1/2] configure: Remove clang version checks We no C++ and an incredibly small amount of C code as part of the build, so there's not really much need for us to strictly check the version of compilers as we're not really stressing anything. LLVM is a pretty huge chunk of C++ but it should be the responsibility of LLVM to ensure that it can build with a particular clang/gcc version, not ours (as this logic changes over time). These version checks seem to basically just by us a regular stream of PRs every six weeks or so when a new version is releases, so they're not really buying us much. As a result, remove them and we can add then back piecemeal perhaps as a blacklist if we really need to. --- configure | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/configure b/configure index 38f3e3b00c6d8..d4178963f8691 100755 --- a/configure +++ b/configure @@ -1028,37 +1028,6 @@ if [ -n "$CFG_ENABLE_CLANG" ] then case "$CC" in (''|*clang) - CFG_CLANG_REPORTED_VERSION=$($CFG_CC --version | grep version) - - if echo $CFG_CLANG_REPORTED_VERSION | grep -q "(based on LLVM "; then - CFG_CLANG_VERSION=$(echo $CFG_CLANG_REPORTED_VERSION | sed 's/.*(based on LLVM \(.*\))/\1/') - elif echo $CFG_CLANG_REPORTED_VERSION | grep -q "Apple LLVM"; then - CFG_OSX_CLANG_VERSION=$(echo $CFG_CLANG_REPORTED_VERSION | sed 's/.*version \(.*\) .*/\1/') - else - CFG_CLANG_VERSION=$(echo $CFG_CLANG_REPORTED_VERSION | sed 's/.*version \(.*\) .*/\1/') - fi - - if [ -n "$CFG_OSX_CLANG_VERSION" ] - then - case $CFG_OSX_CLANG_VERSION in - (7.0* | 7.1* | 7.2* | 7.3*) - step_msg "found ok version of APPLE CLANG: $CFG_OSX_CLANG_VERSION" - ;; - (*) - err "bad APPLE CLANG version: $CFG_OSX_CLANG_VERSION, need >=7.0" - ;; - esac - else - case $CFG_CLANG_VERSION in - (3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7* | 3.8* | 3.9*) - step_msg "found ok version of CLANG: $CFG_CLANG_VERSION" - ;; - (*) - err "bad CLANG version: $CFG_CLANG_VERSION, need >=3.0svn" - ;; - esac - fi - if [ -z "$CC" ] then CFG_CC="clang" From 6e326e5b86c0f9f8f33684e38a1f61fb5e6e8bac Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 30 Jun 2016 15:42:40 -0700 Subject: [PATCH 2/2] Bump beta version to .3 --- mk/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/main.mk b/mk/main.mk index 3e02bbaedb097..086487578122c 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.10.0 # An optional number to put after the label, e.g. '.2' -> '-beta.2' # NB Make sure it starts with a dot to conform to semver pre-release # versions (section 9) -CFG_PRERELEASE_VERSION=.2 +CFG_PRERELEASE_VERSION=.3 # Append a version-dependent hash to each library, so we can install different # versions in the same place