fix bootstrap

2 files changed, 12 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3f7b875aa8e..9d620d5250c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gcc-git
 	pkgdesc = The GNU Compiler Collection
-	pkgver = 12.0.1_r191804.gafeaaf4b352
+	pkgver = 12.0.1_r191818.g800b3191c75
 	pkgrel = 1
 	url = https://gcc.gnu.org
 	arch = x86_64
@@ -42,7 +42,7 @@ pkgbase = gcc-git
 pkgname = gcc-git
 	pkgdesc = The GNU Compiler Collection - C and C++ frontends
 	groups = base-devel-git
-	depends = gcc-libs-git=12.0.1_r191804.gafeaaf4b352-1
+	depends = gcc-libs-git=12.0.1_r191818.g800b3191c75-1
 	depends = binutils>=2.28
 	depends = libmpc
 	depends = zstd
@@ -59,7 +59,7 @@ pkgname = gcc-git
 pkgname = gcc-libs-git
 	pkgdesc = Runtime libraries shipped by GCC
 	depends = glibc>=2.27
-	provides = gcc-libs=12.0.1_r191804.gafeaaf4b352-1
+	provides = gcc-libs=12.0.1_r191818.g800b3191c75-1
 	provides = gcc-multilib
 	provides = gcc-multilib-git
 	provides = libgo.so
@@ -77,7 +77,7 @@ pkgname = gcc-libs-git
 
 pkgname = gcc-fortran-git
 	pkgdesc = Fortran front-end for GCC
-	depends = gcc-git=12.0.1_r191804.gafeaaf4b352-1
+	depends = gcc-git=12.0.1_r191818.g800b3191c75-1
 	provides = gcc-fortran
 	provides = gcc-multilib
 	provides = gcc-multilib-git
@@ -86,7 +86,7 @@ pkgname = gcc-fortran-git
 
 pkgname = gcc-objc-git
 	pkgdesc = Objective-C front-end for GCC
-	depends = gcc-git=12.0.1_r191804.gafeaaf4b352-1
+	depends = gcc-git=12.0.1_r191818.g800b3191c75-1
 	provides = gcc-multilib
 	provides = gcc-multilib-git
 	conflicts = gcc-objc
@@ -94,7 +94,7 @@ pkgname = gcc-objc-git
 
 pkgname = gcc-ada-git
 	pkgdesc = Ada front-end for GCC (GNAT)
-	depends = gcc-git=12.0.1_r191804.gafeaaf4b352-1
+	depends = gcc-git=12.0.1_r191818.g800b3191c75-1
 	provides = gcc-ada
 	provides = gcc-multilib
 	provides = gcc-multilib-git
@@ -105,7 +105,7 @@ pkgname = gcc-ada-git
 
 pkgname = gcc-go-git
 	pkgdesc = Go front-end for GCC
-	depends = gcc-git=12.0.1_r191804.gafeaaf4b352-1
+	depends = gcc-git=12.0.1_r191818.g800b3191c75-1
 	provides = go=1.12.2
 	provides = gcc-multilib
 	provides = gcc-multilib-git
@@ -116,7 +116,7 @@ pkgname = gcc-go-git
 
 pkgname = gcc-d-git
 	pkgdesc = D frontend for GCC
-	depends = gcc-git=12.0.1_r191804.gafeaaf4b352-1
+	depends = gcc-git=12.0.1_r191818.g800b3191c75-1
 	provides = gcc-d
 	provides = gdc
 	provides = gdc-git
@@ -126,4 +126,4 @@ pkgname = gcc-d-git
 
 pkgname = libgccjit-git
 	pkgdesc = Just-In-Time Compilation with GCC backend
-	depends = gcc-git=12.0.1_r191804.gafeaaf4b352-1
+	depends = gcc-git=12.0.1_r191818.g800b3191c75-1
diff --git a/PKGBUILD b/PKGBUILD
index 72d2728f282d..6d7ff3aaad41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,9 @@
 
 pkgbase=gcc-git
 pkgname=({gcc,gcc-libs,gcc-fortran,gcc-objc,gcc-ada,gcc-go,gcc-d,libgccjit}-git)
-pkgver=12.0.1_r191804.gafeaaf4b352
+pkgver=12.0.1_r191818.g800b3191c75
 _majorver=${pkgver%%.*}
+_islver=0.24
 pkgrel=1
 pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
@@ -66,9 +67,6 @@ prepare() {
   # Arch Linux installs x86_64 libraries /lib
   sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
 
-  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" gcc/configure
-
   # D hacks
   patch -Np1 -i "$srcdir/gdc_phobos_path.patch"
 
@@ -124,8 +122,7 @@ build() {
   make -O STAGE1_CFLAGS="-O2" \
           BOOT_CFLAGS="$CFLAGS" \
           BOOT_LDFLAGS="$LDFLAGS" \
-          LDFLAGS_FOR_TARGET="$LDFLAGS" \
-          profiledbootstrap
+          LDFLAGS_FOR_TARGET="$LDFLAGS" 
 
   # make documentation
   make -O -C $CHOST/libstdc++-v3/doc doc-man-doxygen