len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

toolchain: To build GCC for hosted targets, we need -std=gnu++11 for stage2.

Browse source 
But for stage1 (and non-hosted targets) we can stick with -std=gnu++03.

This keeps everyone happy with no apparent regerssions on older
host compilers.

Change-Id: I1300574557bc8d4d13e5cf07d4ae85645998f071
This commit is contained in:
Solomon Peachy 2021-06-04 08:45:10 -04:00
parent 49dfc8be27
commit 62098a0cc9
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tools/rockboxdev.sh
View file

@ -354,6 +354,14 @@ buildtool() {
;; ;;
esac esac
if [ "$RESTART_STEP" == "gcc-stage1" ] ; then
CXXFLAGS="-std=gnu++03"
elif [ "$RESTART_STEP" == "gcc-stage2" ] ; then
CXXFLAGS="-std=gnu++11"
else
CXXFLAGS=""
fi
if [ "$tool" == "zlib" ]; then if [ "$tool" == "zlib" ]; then
echo "ROCKBOXDEV: $toolname/configure" echo "ROCKBOXDEV: $toolname/configure"
# NOTE glibc requires to be compiled with optimization # NOTE glibc requires to be compiled with optimization
@ -363,7 +371,7 @@ buildtool() {
elif [ "$config_opt" != "NO_CONFIGURE" ]; then elif [ "$config_opt" != "NO_CONFIGURE" ]; then
echo "ROCKBOXDEV: $toolname/configure" echo "ROCKBOXDEV: $toolname/configure"
# NOTE glibc requires to be compiled with optimization # NOTE glibc requires to be compiled with optimization
CFLAGS='-U_FORTIFY_SOURCE -fgnu89-inline -O2' CXXFLAGS='-std=c++03' run_cmd "$logfile" \ CFLAGS='-U_FORTIFY_SOURCE -fgnu89-inline -O2' CXXFLAGS="$CXXFLAGS" run_cmd "$logfile" \
"$cfg_dir/configure" "--prefix=$prefix" \ "$cfg_dir/configure" "--prefix=$prefix" \
--disable-docs $config_opt --disable-docs $config_opt
fi fi
@ -473,7 +481,7 @@ build() {
./configure --prefix=$prefix $configure_params ./configure --prefix=$prefix $configure_params
;; ;;
*) *)
CFLAGS='-U_FORTIFY_SOURCE -fgnu89-inline -fcommon' CXXFLAGS='-std=c++03' ../$toolname-$version/configure --target=$target --prefix=$prefix --enable-languages=c --disable-libssp --disable-docs $configure_params CFLAGS='-U_FORTIFY_SOURCE -fgnu89-inline -fcommon' CXXFLAGS='-std=gnu++03' ../$toolname-$version/configure --target=$target --prefix=$prefix --enable-languages=c --disable-libssp --disable-docs $configure_params
;; ;;
esac esac
@ -634,11 +642,13 @@ build_linux_toolchain () {
# build glibc using the first stage cross compiler # build glibc using the first stage cross compiler
# we need to set the prefix to /usr because the glibc runs on the actual # we need to set the prefix to /usr because the glibc runs on the actual
# target and is indeed installed in /usr # target and is indeed installed in /usr
RESTART_STEP="glibc" \
prefix="/usr" \ prefix="/usr" \
buildtool "glibc" "$glibc_ver" "--target=$target --host=$target --build=$MACHTYPE \ buildtool "glibc" "$glibc_ver" "--target=$target --host=$target --build=$MACHTYPE \
--with-__thread --with-headers=$sysroot/usr/include $glibc_opts" \ --with-__thread --with-headers=$sysroot/usr/include $glibc_opts" \
"" "install install_root=$sysroot" "" "install install_root=$sysroot"
# build stage 2 compiler # build stage 2 compiler
RESTART_STEP="gcc-stage2" \
buildtool "gcc" "$gcc_ver" "$gcc_opts --enable-languages=c,c++ --target=$target \ buildtool "gcc" "$gcc_ver" "$gcc_opts --enable-languages=c,c++ --target=$target \
--with-sysroot=$sysroot" "" "" --with-sysroot=$sysroot" "" ""
} }