Fix build-gnu-libstdc++.sh to not depend on toolchain's sysroot
CFLAGS and CXXFLAGS already contain correct --sysroot. Add/export
CPPFLAGS to also contain --sysroot otherwise in NDK package
where toolchains/*/*/*/sysroot doesn't exist, libstdc++-v3/configure
may fail to find correct headers and fail the build.
Change-Id: Ia2810ec1820f581251532af3d31b9daa2f433bf3
diff --git a/build/tools/build-gnu-libstdc++.sh b/build/tools/build-gnu-libstdc++.sh
index 927cb86..a6b0c62 100755
--- a/build/tools/build-gnu-libstdc++.sh
+++ b/build/tools/build-gnu-libstdc++.sh
@@ -165,6 +165,7 @@
fi
export CFLAGS="-fPIC $CFLAGS --sysroot=$SYSROOT -fexceptions -funwind-tables -D__BIONIC__ -O2 $EXTRA_FLAGS"
export CXXFLAGS="-fPIC $CXXFLAGS --sysroot=$SYSROOT -fexceptions -frtti -funwind-tables -D__BIONIC__ -O2 $EXTRA_FLAGS"
+ export CPPFLAGS="$CPPFLAGS --sysroot=$SYSROOT"
export CC=${BINPREFIX}gcc
export CXX=${BINPREFIX}g++
