diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-12 22:58:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 22:58:18 +0100 |
| commit | 35ce8cf9c5dea5c700315cb4d8031b533c8e535d (patch) | |
| tree | a59b32d467fa0c636b7fe707536d4d0352414eab | |
| parent | aa4be0446a434c82ebb1e452eb2dcdb3c20c2a9a (diff) | |
| parent | f48c4fb256438e7928d6fdb17c43ff14a22c725d (diff) | |
Merge pull request #4427 from vespa-engine/balder/use-devtoolset-7-take-2
use-devtoolset-7
| -rwxr-xr-x | bootstrap-cpp.sh | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 8 | ||||
| -rwxr-xr-x | travis/travis-build-full.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap-cpp.sh b/bootstrap-cpp.sh index 47d2a82622a..e6b4c816065 100755 --- a/bootstrap-cpp.sh +++ b/bootstrap-cpp.sh @@ -33,7 +33,7 @@ mkdir -p "${BUILD_DIR}" || { BUILD_DIR=$(realpath "${BUILD_DIR}") # Build it -source /opt/rh/devtoolset-6/enable || true +source /opt/rh/devtoolset-7/enable || true cd "${SOURCE_DIR}" bash ./bootstrap.sh full cd "${BUILD_DIR}" diff --git a/dist/vespa.spec b/dist/vespa.spec index c17454804dc..17a9aeb03f4 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -18,11 +18,11 @@ Source0: vespa-%{version}.tar.gz %if 0%{?centos} BuildRequires: epel-release BuildRequires: centos-release-scl -BuildRequires: devtoolset-6-gcc-c++ -BuildRequires: devtoolset-6-libatomic-devel -BuildRequires: devtoolset-6-binutils +BuildRequires: devtoolset-7-gcc-c++ +BuildRequires: devtoolset-7-libatomic-devel +BuildRequires: devtoolset-7-binutils BuildRequires: rh-maven33 -%define _devtoolset_enable /opt/rh/devtoolset-6/enable +%define _devtoolset_enable /opt/rh/devtoolset-7/enable %define _rhmaven33_enable /opt/rh/rh-maven33/enable %endif %if 0%{?fedora} diff --git a/travis/travis-build-full.sh b/travis/travis-build-full.sh index fc0efb843aa..53e174b534b 100755 --- a/travis/travis-build-full.sh +++ b/travis/travis-build-full.sh @@ -6,7 +6,7 @@ export SOURCE_DIR=/source export NUM_THREADS=6 export MALLOC_ARENA_MAX=1 export MAVEN_OPTS="-Xms128m -Xmx2g" -source /etc/profile.d/devtoolset-6.sh || true +source /etc/profile.d/devtoolset-7.sh || true ccache --max-size=1250M ccache --set-config=compression=true |