diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-10-03 08:52:04 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-10-07 18:06:53 +0200 |
| commit | 223fc9fca598b371b4429e25eaedfde57ac8d540 (patch) | |
| tree | 2281f148d9456bbf287f55b9236597d3679f31db | |
| parent | d1fdfe9fd78c7fa55c9ed6d66a14c6c522858bde (diff) | |
| download | ndk-223fc9fca598b371b4429e25eaedfde57ac8d540.tar.gz | |
build-gcc.sh: Remove --copy-libstdcxx and --keep-libstdcxx options
These options are obsolete. Instead, the build-gnu-libstdc++.sh
script can be used to rebuild the GNU libstdc++ library directly.
Change-Id: I281653915a5bce272ac8d593038291b73270c128
| -rwxr-xr-x | build/tools/build-gcc.sh | 20 | ||||
| -rwxr-xr-x | build/tools/rebuild-all-prebuilt.sh | 4 |
2 files changed, 5 insertions, 19 deletions
diff --git a/build/tools/build-gcc.sh b/build/tools/build-gcc.sh index bb2736d38..8decfe1fc 100755 --- a/build/tools/build-gcc.sh +++ b/build/tools/build-gcc.sh @@ -54,12 +54,6 @@ register_var_option "--gmp-version=<version>" GMP_VERSION "Specify gmp version" MPFR_VERSION=2.4.1 register_var_option "--mpfr-version=<version>" MPFR_VERSION "Specify mpfr version" -COPY_LIBSTDCXX=no -register_var_option "--copy-libstdcxx" COPY_LIBSTDCXX "Copy libstdc++ to <ndk-dir>/$GNUSTL_SUBDIR" - -KEEP_LIBSTDCXX=no -register_var_option "--keep-libstdcxx" KEEP_LIBSTDCXX "Experimental: keep libstdc++ inside toolchain" - register_jobs_option register_mingw_option register_try64_option @@ -258,19 +252,11 @@ run rm -rf $TOOLCHAIN_PATH/lib32/libiberty.a run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/libiberty.a run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/*/libiberty.a -# Copy libstdc++ headers and libraries if needed -if [ "$COPY_LIBSTDCXX" = "yes" ] ; then - dump "Copying libstdc++ prebuilt binaries." - $ANDROID_NDK_ROOT/build/tools/copy-libstdcxx.sh "$TOOLCHAIN_PATH" "$NDK_DIR" --toolchain=$TOOLCHAIN -fi - # Remove libstdc++ for now (will add it differently later) # We had to build it to get libsupc++ which we keep. -if [ "$KEEP_LIBSTDCXX" = "no" ] ; then - run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/libstdc++.* - run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/*/libstdc++.* - run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/include/c++ -fi +run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/libstdc++.* +run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/lib/*/libstdc++.* +run rm -rf $TOOLCHAIN_PATH/$ABI_CONFIGURE_TARGET/include/c++ # strip binaries to reduce final package size run strip $TOOLCHAIN_PATH/bin/* diff --git a/build/tools/rebuild-all-prebuilt.sh b/build/tools/rebuild-all-prebuilt.sh index ecc4e8985..ebe752ee2 100755 --- a/build/tools/rebuild-all-prebuilt.sh +++ b/build/tools/rebuild-all-prebuilt.sh @@ -288,13 +288,13 @@ get_toolchain_sources case "$ARCH" in arm ) - build_toolchain arm-linux-androideabi-4.4.3 --copy-libstdcxx + build_toolchain arm-linux-androideabi-4.4.3 if [ -z "$HOST_ONLY" ]; then build_gdbserver arm-linux-androideabi-4.4.3 fi ;; x86 ) - build_toolchain x86-4.4.3 --copy-libstdcxx + build_toolchain x86-4.4.3 if [ -z "$HOST_ONLY" ]; then build_gdbserver x86-4.4.3 fi |