diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2014-12-21 12:32:28 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2014-12-21 12:32:28 +0000 |
commit | 060463bbb14343424dae3d5a5f04e267a1bbc052 (patch) | |
tree | c59d1c4d57434c2e340dc1cfdd33ae78d10cbfe5 /config/gcc.conf | |
parent | 2fce355a2d42a9f11818a3800025c14469c5a746 (diff) | |
parent | 774869f1946aeb1ebb3316e1d2c9c2c74312a68c (diff) |
Merge branch 'master' into merge
Conflicts:
config/boards/dragon-01.exp
config/boards/tcwg-common.exp
config/boards/tcwgbuild01/tcwgblack.exp
config/boards/tcwgbuild01/tcwgbuild.exp
config/boards/tcwgbuild02/tcwgblack.exp
config/boards/tcwgbuild02/tcwgbuild.exp
config/boards/tcwgbuild03/tcwgblack.exp
config/boards/tcwgbuild03/tcwgbuild.exp
config/boards/tcwgbuild04/tcwgblack.exp
config/boards/tcwgbuild04/tcwgbuild.exp
config/boards/tcwgbuild05/tcwgblack.exp
config/boards/tcwgbuild05/tcwgbuild.exp
config/boards/tcwgbuild06/tcwgbuild.exp
config/boards/tcwgd01.exp
config/boards/tcwgrob/tcwgapm.exp
config/boards/toolchain64/tcwgbuild.exp
config/eglibc.conf
config/gcc.conf
config/linaro.exp
configure
configure.ac
jenkins.sh
lib/common.sh
lib/make.sh
scripts/BuildFarm.job
scripts/MakeRelease.job
tcwgweb.sh
Diffstat (limited to 'config/gcc.conf')
-rw-r--r-- | config/gcc.conf | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/config/gcc.conf b/config/gcc.conf index c3377e37..6882bab8 100644 --- a/config/gcc.conf +++ b/config/gcc.conf @@ -56,7 +56,7 @@ fi # Default set of languages to build. If building binary tarballs, we don't build all the # front ends. if test x"${tarbin}" != xyes; then - languages="c,c++,go,fortran,lto" + languages="c,c++,fortran,lto" else languages="c,c++,fortran,lto" fi @@ -144,12 +144,18 @@ if test x"${build}" != x"${target}"; then languages="${with_languages}" fi # The sysroot path depends on the C library version. - if test x"{$tarbin}" = x; then + if test x"${tarbin}" = xyes; then local sysroot="/opt/linaro/sysroot-${libc_version}-${target}" else local sysroot="${local_builds}/sysroot-${target}" fi - stage2_flags="--with-build-sysroot=${sysroots} --enable-lto --enable-linker-build-id --enable-long-long --enable-shared --with-sysroot=${sysroot} --enable-languages=${languages} --enable-checking" + stage2_flags="--with-build-sysroot=${sysroots} --enable-lto --enable-linker-build-id --enable-long-long --enable-shared --with-sysroot=${sysroot} --enable-languages=${languages} -enable-fix-cortex-a53-835769" + + if test x"${release}" = x; then + stage2_flags="${stage2_flags} --enable-checking=yes" + else + stage2_flags="${stage2_flags} --enable-checking=release" + fi if test x"${bootstrap}" = x"yes"; then stage2_flags="${stage2_flags} --enable-bootstrap" |