aboutsummaryrefslogtreecommitdiffstats
path: root/build-gcc.sh
diff options
context:
space:
mode:
authorCaroline Tice <cmtice@google.com>2016-02-29 22:49:18 (GMT)
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-02-29 22:49:18 (GMT)
commit3a800d7d75ceba88429096186a2150a2d938334a (patch)
tree9d9c36a627f01c31b077cd8253acc681d5cc4bbf /build-gcc.sh
parentb9de1157289455b0ca26daff519d4a0ddcd1fa13 (diff)
parent817a788f9eb01eff367191401d48f2aaa8d4f428 (diff)
downloadtoolchain_gcc-3a800d7d75ceba88429096186a2150a2d938334a.zip
toolchain_gcc-3a800d7d75ceba88429096186a2150a2d938334a.tar.gz
toolchain_gcc-3a800d7d75ceba88429096186a2150a2d938334a.tar.bz2
Merge "Unify ChromeOS and Android versions of GCC."
Diffstat (limited to 'build-gcc.sh')
-rwxr-xr-xbuild-gcc.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/build-gcc.sh b/build-gcc.sh
index f279347..707ff27 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -380,8 +380,15 @@ fi
# Put our freshly-built GNU sed ahead of the system one on the path.
export PATH=$BUILD_OUT/sed/:$PATH
+if [ -f $SRC_DIR/gcc/gcc-$GCC_VERSION/gcc/BASE-VER ] ; then
+ INCLUDE_VERSION=`cat $SRC_DIR/gcc/gcc-$GCC_VERSION/gcc/BASE-VER`
+else
+ INCLUDE_VERSION=$GCC_VERSION
+fi
+
cd $BUILD_OUT && run \
$BUILD_SRCDIR/configure --target=$ABI_CONFIGURE_TARGET \
+ --enable-bionic-libs \
--enable-initfini-array \
--host=$ABI_CONFIGURE_HOST \
--build=$ABI_CONFIGURE_BUILD \
@@ -394,7 +401,7 @@ $BUILD_SRCDIR/configure --target=$ABI_CONFIGURE_TARGET \
--with-gmp-version=$GMP_VERSION \
--with-gcc-version=$CONFIGURE_GCC_VERSION \
--with-gdb-version=none \
- --with-gxx-include-dir=$PREFIX_LOCATION/include/c++/$GCC_VERSION \
+ --with-gxx-include-dir=$PREFIX_LOCATION/include/c++/$INCLUDE_VERSION \
--with-bugurl=$DEFAULT_ISSUE_TRACKER_URL \
--enable-languages=$ENABLE_LANGUAGES \
$EXTRA_CONFIG_FLAGS \