diff --git a/build.sh b/build.sh index ee4fa2e..073f79c 100755 --- a/build.sh +++ b/build.sh @@ -454,8 +454,10 @@ if [ ! -f "$STEPS_DIR/gcc-step3" ]; then make -j 32 # if build fails add --disable-libsanitizer make -j 32 install + #make -j 32 DESTDIR="$LFS" install-target-libgcc + cd "$BASE_DIR" - rm -rf "$LFS_BUILD/gcc" + #rm -rf "$LFS_BUILD/gcc" touch "$STEPS_DIR/gcc-step3" fi @@ -473,9 +475,9 @@ echo 'int main(){}' | "$CC" $CPPFLAGS -xc - "$READELF" -l a.out | grep ld-linux rm -v a.out -cat test_compiler.cpp | "$CXX" $CPPFLAGS -xc++ - -"$LFS_TGT-readelf" -l a.out -rm -v a.out +#cat test_compiler.cpp | "$CXX" $CPPFLAGS -xc++ - +#"$LFS_TGT-readelf" -l a.out +#rm -v a.out # build m4 if [ ! -f "$STEPS_DIR/m4" ]; then @@ -697,13 +699,13 @@ if [ ! -f "$STEPS_DIR/check" ]; then cd build-$LFS_TGT "../configure" \ - --prefix=$LFS \ + --prefix=/usr \ --host=${LFS_TGT} \ --build=${BUILD_MACHINE_TRIPLET} \ - --libdir=$LFS/lib + --libdir=/lib make -j 32 - make -j 32 install + make -j 32 DESTDIR="$LFS" install cd "$BASE_DIR" rm -rf "$LFS_BUILD/check" @@ -1216,8 +1218,6 @@ if [ ! -f "$STEPS_DIR/acl" ]; then touch "$STEPS_DIR/acl" fi -exit 0 - # build pcre2 if [ ! -f "$STEPS_DIR/pcre2" ]; then if [ ! -d "$LFS_BUILD/pcre2" ]; then @@ -1240,6 +1240,7 @@ if [ ! -f "$STEPS_DIR/pcre2" ]; then --host=${LFS_TGT} \ --build=${BUILD_MACHINE_TRIPLET} \ --prefix=/usr \ + --enable-shared \ --enable-jit \ --enable-pcre2-16 \ --enable-pcre2-32 \