From ad1a353378e5a6aa8bd6e8bcc7567876164dc862 Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Dec 03 2015 14:24:06 +0000
Subject: Adding BUILD_CC to the STAGE1 bootstrap recipes


---

diff --git a/STAGE1-glibc b/STAGE1-glibc
index f9ee5ba..4a31ea0 100644
--- a/STAGE1-glibc
+++ b/STAGE1-glibc
@@ -37,8 +37,8 @@ echo libc_cv_gcc_builtin_expect=yes >> config.cache
 
 $SRC/$GV/configure $GLIBCARGS
 notparallel
-make $J ARCH=${KARCH} cross-compiling=yes
-make DESTDIR=$ROOTFS $J ARCH=${KARCH} cross-compiling=yes install
+make $J ARCH=${KARCH} BUILD_CC=gcc cross-compiling=yes
+make DESTDIR=$ROOTFS $J ARCH=${KARCH} BUILD_CC=gcc cross-compiling=yes install
 
 ( cd $ROOTFS/usr/include/bits
   sed '/ifndef.*NO_LONG_DOUBLE/,/#endif/d' < mathdef.h > mathdef.h.new
@@ -81,8 +81,8 @@ if [ ! "$TARGET32" = "" ]; then
 
   $SRC/$GV/configure $GLIBCARGS
   notparallel
-  make $J ARCH=${KARCH} cross-compiling=yes
-  make DESTDIR=$ROOTFS $J ARCH=${KARCH} cross-compiling=yes install
+  make $J ARCH=${KARCH} BUILD_CC=gcc cross-compiling=yes
+  make DESTDIR=$ROOTFS $J ARCH=${KARCH} BUILD_CC=gcc cross-compiling=yes install
 
   ( cd $ROOTFS/usr/include/bits
     sed '/ifndef.*NO_LONG_DOUBLE/,/#endif/d' < mathdef.h > mathdef.h.new
diff --git a/STAGE1-glibc-headers b/STAGE1-glibc-headers
index f1dad9e..c58c541 100644
--- a/STAGE1-glibc-headers
+++ b/STAGE1-glibc-headers
@@ -32,7 +32,7 @@ echo libc_cv_gcc_builtin_expect=yes >> config.cache
 
 $SRC/$GV/configure $GLIBCARGS
 notparallel
-make DESTDIR=$ROOTFS $J ARCH=${KARCH} cross-compiling=yes install-headers
+make DESTDIR=$ROOTFS $J ARCH=${KARCH} BUILD_CC=gcc cross-compiling=yes install-headers
 touch $ROOTFS/usr/include/gnu/stubs.h
 touch $ROOTFS/usr/include/bits/stdio_lim.h
 
@@ -43,7 +43,7 @@ touch $ROOTFS/usr/include/bits/stdio_lim.h
 
 # We also build just enough files to link libgcc.so.  The fake
 # libc.so will never actually get used, but simplifies the boostrap.
-make $J ARCH=${KARCH} cross-compiling=yes csu/subdir_lib
+make $J ARCH=${KARCH} BUILD_CC=gcc cross-compiling=yes csu/subdir_lib
 
 mkdirp $ROOTFS/usr/lib${SUFFIX}
 for file in `cd csu; echo crt*.o`; do
@@ -90,7 +90,7 @@ if [ ! "$TARGET32" = "" ]; then
 
   $SRC/$GV/configure $GLIBCARGS
   notparallel
-  make DESTDIR=$ROOTFS $J ARCH=${KARCH} cross-compiling=yes install-headers
+  make DESTDIR=$ROOTFS $J ARCH=${KARCH} BUILD_CC=gcc cross-compiling=yes install-headers
   touch $ROOTFS/usr/include/gnu/stubs.h
   touch $ROOTFS/usr/include/bits/stdio_lim.h
 
@@ -101,7 +101,7 @@ if [ ! "$TARGET32" = "" ]; then
 
   # We also build just enough files to link libgcc.so.  The fake
   # libc.so will never actually get used, but simplifies the boostrap.
-  make $J ARCH=${KARCH} cross-compiling=yes csu/subdir_lib
+  make $J ARCH=${KARCH} BUILD_CC=gcc cross-compiling=yes csu/subdir_lib
 
   mkdirp $ROOTFS/usr/lib
   for file in `cd csu; echo crt*.o`; do