diff options
| author | Caroline Tice <cmtice@google.com> | 2016-02-10 14:40:41 -0800 |
|---|---|---|
| committer | Caroline Tice <cmtice@google.com> | 2016-02-26 08:25:55 -0800 |
| commit | 817a788f9eb01eff367191401d48f2aaa8d4f428 (patch) | |
| tree | 637f745404b37fbf3fcff629227d7d542725e5fe /build-gcc.sh | |
| parent | a4ca82cac69c3147143d7b4b4d7cdeb5e02f20ef (diff) | |
| download | toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.gz toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.bz2 toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.zip | |
Unify ChromeOS and Android versions of GCC.
This CL updates Android's GCC to match ChromeOS's GCC (with
appropriate patches applied in both places to make sure no
cherry-picked changes are lost).
Change-Id: I390140c449b0e5df9ee78a06268319c8c510302f
Diffstat (limited to 'build-gcc.sh')
| -rwxr-xr-x | build-gcc.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build-gcc.sh b/build-gcc.sh index a964b2aee..6b94d9b5d 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 \ |