Rebuild gcc with the new configuration and disable libsanitizer
This commit is contained in:
parent
83cd1ff4a7
commit
01713d684c
1 changed files with 40 additions and 31 deletions
71
build.sh
71
build.sh
|
|
@ -183,6 +183,7 @@ if [ ! -f "$STEPS_DIR/gcc-step1" ]; then
|
||||||
--disable-libvtv \
|
--disable-libvtv \
|
||||||
--disable-libstdcxx \
|
--disable-libstdcxx \
|
||||||
--disable-decimal-float \
|
--disable-decimal-float \
|
||||||
|
--disable-libsanitizer \
|
||||||
--enable-languages=c
|
--enable-languages=c
|
||||||
make -j 32 all-gcc # if build fails add --disable-libsanitizer
|
make -j 32 all-gcc # if build fails add --disable-libsanitizer
|
||||||
make -j 32 install-gcc
|
make -j 32 install-gcc
|
||||||
|
|
@ -193,17 +194,17 @@ if [ ! -f "$STEPS_DIR/gcc-step1" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# From now on use
|
# From now on use
|
||||||
export BUILD_CC=gcc
|
#export BUILD_CC=gcc
|
||||||
export CC="$LFS_TGT-gcc"
|
#export CC="$LFS_TGT-gcc"
|
||||||
export CXX="$LFS_TGT-g++"
|
#export CXX="$LFS_TGT-g++"
|
||||||
export AS="$LFS_TGT-as"
|
#export AS="$LFS_TGT-as"
|
||||||
export LD="$LFS_TGT-ld"
|
#export LD="$LFS_TGT-ld"
|
||||||
export AR="$LFS_TGT-ar"
|
#export AR="$LFS_TGT-ar"
|
||||||
export RANLIB="$LFS_TGT-ranlib"
|
#export RANLIB="$LFS_TGT-ranlib"
|
||||||
# remove hardening options for building libraries
|
## remove hardening options for building libraries
|
||||||
export CFLAGS="-U_FORTIFY_SOURCE -O2"
|
#export CFLAGS="-U_FORTIFY_SOURCE -O2"
|
||||||
export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
|
#export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
|
||||||
export LD_LIBRARY_PATH_old="$LD_LIBRARY_PATH"
|
#export LD_LIBRARY_PATH_old="$LD_LIBRARY_PATH"
|
||||||
unset LD_LIBRARY_PATH
|
unset LD_LIBRARY_PATH
|
||||||
|
|
||||||
# build glibc
|
# build glibc
|
||||||
|
|
@ -287,14 +288,14 @@ if [ ! -f "$STEPS_DIR/glibc" ]; then
|
||||||
touch "$STEPS_DIR/glibc"
|
touch "$STEPS_DIR/glibc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
unset CC
|
#unset CC
|
||||||
unset CXX
|
#unset CXX
|
||||||
unset LD
|
#unset LD
|
||||||
unset AS
|
#unset AS
|
||||||
unset AR
|
#unset AR
|
||||||
unset RANLIB
|
#unset RANLIB
|
||||||
unset OBJDUMP
|
#unset OBJDUMP
|
||||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_old"
|
#export LD_LIBRARY_PATH="$LD_LIBRARY_PATH_old"
|
||||||
|
|
||||||
if [ ! -f "$STEPS_DIR/gcc-step2" ]; then
|
if [ ! -f "$STEPS_DIR/gcc-step2" ]; then
|
||||||
#if [ ! -d "$LFS_BUILD/gcc/build" ]; then
|
#if [ ! -d "$LFS_BUILD/gcc/build" ]; then
|
||||||
|
|
@ -327,26 +328,34 @@ if [ ! -f "$STEPS_DIR/gcc-step2" ]; then
|
||||||
--disable-libvtv \
|
--disable-libvtv \
|
||||||
--disable-libstdcxx \
|
--disable-libstdcxx \
|
||||||
--disable-decimal-float \
|
--disable-decimal-float \
|
||||||
|
--disable-libsanitizer \
|
||||||
--enable-languages=c
|
--enable-languages=c
|
||||||
|
|
||||||
|
# Repeat this
|
||||||
|
make -j 32 all-gcc
|
||||||
|
|
||||||
make -j 32 all-target-libgcc # if build fails add --disable-libsanitizer
|
make -j 32 all-target-libgcc # if build fails add --disable-libsanitizer
|
||||||
|
|
||||||
|
# Repeat this too
|
||||||
|
make -j 32 install-gcc
|
||||||
|
|
||||||
make -j 32 install-target-libgcc
|
make -j 32 install-target-libgcc
|
||||||
cd "$BASE_DIR"
|
cd "$BASE_DIR"
|
||||||
#rm -rf "$LFS_BUILD/gcc/build" # Do not remove the whole gcc directory: we need it for libstdc++
|
#rm -rf "$LFS_BUILD/gcc/build" # Do not remove the whole gcc directory: we need it for libstdc++
|
||||||
touch "$STEPS_DIR/gcc-step2"
|
touch "$STEPS_DIR/gcc-step2"
|
||||||
fi
|
fi
|
||||||
|
exit 0
|
||||||
export CC="$LFS_TGT-gcc"
|
#export CC="$LFS_TGT-gcc"
|
||||||
export CXX="$LFS_TGT-g++"
|
#export CXX="$LFS_TGT-g++"
|
||||||
export AS="$LFS_TGT-as"
|
#export AS="$LFS_TGT-as"
|
||||||
export LD="$LFS_TGT-ld"
|
#export LD="$LFS_TGT-ld"
|
||||||
export AR="$LFS_TGT-ar"
|
#export AR="$LFS_TGT-ar"
|
||||||
export RANLIB="$LFS_TGT-ranlib"
|
#export RANLIB="$LFS_TGT-ranlib"
|
||||||
# remove hardening options for building libraries
|
## remove hardening options for building libraries
|
||||||
export CFLAGS="-U_FORTIFY_SOURCE -O2"
|
#export CFLAGS="-U_FORTIFY_SOURCE -O2"
|
||||||
export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
|
#export CPPFLAGS="-U_FORTIFY_SOURCE -O2"
|
||||||
export LD_LIBRARY_PATH_old="$LD_LIBRARY_PATH"
|
#export LD_LIBRARY_PATH_old="$LD_LIBRARY_PATH"
|
||||||
unset LD_LIBRARY_PATH
|
#unset LD_LIBRARY_PATH
|
||||||
|
|
||||||
if [ ! -f "$STEPS_DIR/glibc-step2" ]; then
|
if [ ! -f "$STEPS_DIR/glibc-step2" ]; then
|
||||||
if [ ! -d "$LFS_BUILD/glibc/build" ]; then
|
if [ ! -d "$LFS_BUILD/glibc/build" ]; then
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue