aboutsummaryrefslogtreecommitdiffstats
path: root/build-gcc.sh
diff options
context:
space:
mode:
Diffstat (limited to 'build-gcc.sh')
-rwxr-xr-xbuild-gcc.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/build-gcc.sh b/build-gcc.sh
index 5496e3dfb..f23edb16c 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -205,7 +205,7 @@ if [ -z "$HOST_TAG" ]; then
exit 1
fi
-TOOLCHAIN_SUBDIR=toolchains/$HOST_TAG/$TOOLCHAIN/prebuilt
+TOOLCHAIN_SUBDIR=$TOOLCHAIN
TOOLCHAIN_INSTALL_PATH=$TMPDIR/$TOOLCHAIN_SUBDIR
dump "Using TOOLCHAIN_INSTALL_PATH=$TOOLCHAIN_INSTALL_PATH"
dump "Using TOOLCHAIN_SUBDIR=$TOOLCHAIN_SUBDIR"
@@ -256,6 +256,7 @@ if [ "$BUILD_DEBUGGABLE" = "yes" ] ; then
else
CFLAGS_FOR_BUILD="-O2 -s"
fi
+CXXFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD"
LDFLAGS_FOR_BUILD=
if [ "$MINGW" = "yes" ] ; then
@@ -263,9 +264,10 @@ if [ "$MINGW" = "yes" ] ; then
fi
CFLAGS="$CFLAGS_FOR_BUILD $HOST_CFLAGS"
+CXXFLAGS="$CXXFLAGS_FOR_BUILD $HOST_CFLAGS"
LDFLAGS="$LDFLAGS_FOR_BUILD $HOST_LDFLAGS"
-export CFLAGS LDFLAGS CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD
+export CFLAGS CXXFLAGS LDFLAGS CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD
# This extra flag is used to slightly speed up the build
EXTRA_CONFIG_FLAGS="--disable-bootstrap"
@@ -575,6 +577,8 @@ rm -rf $TOOLCHAIN_INSTALL_PATH/sysroot
if [ "$PACKAGE_DIR" ]; then
make_repo_prop "$TMPDIR/$TOOLCHAIN_SUBDIR"
+ touch $TMPDIR/$TOOLCHAIN_SUBDIR/MODULE_LICENSE_GPL
+ cp $TMPDIR/$TOOLCHAIN_SUBDIR/COPYING $TMPDIR/$TOOLCHAIN_SUBDIR/NOTICE
ARCHIVE="gcc-$ARCH-$HOST_TAG.tar.bz2"
dump "Packaging $ARCHIVE from $TMPDIR/$TOOLCHAIN_SUBDIR"