X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;fp=Makefile;h=1388e750dd877efce3b49a236ff1511bd14e8f81;hb=106748c4b14415206f5d81d78d0a2529b1b2edac;hp=fd5968a123cdcd637d6ed5778e09de332744ad20;hpb=2187ddb66ba19a65c993c7df5f1eb4c8bf274c4c;p=fedora-riscv.git

diff --git a/Makefile b/Makefile
index fd5968a..1388e75 100644
--- a/Makefile
+++ b/Makefile
@@ -490,6 +490,8 @@ mpc-$(MPC_VERSION).tar.gz:
 stage3-chroot/usr/bin/gcc: gcc-$(GCC_X_VERSION).tar.gz
 	rm -rf riscv-gcc-riscv-gcc-$(GCC_X_VERSION)
 	zcat $^ | tar xf -
+	cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION) && \
+	patch -p1 < ../0001-HACKS-TO-GET-GCC-TO-COMPILE.patch
 	mkdir riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build
 	cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && \
 	PATH=$(ROOT)/fixed-gcc:$$PATH \
@@ -504,10 +506,8 @@ stage3-chroot/usr/bin/gcc: gcc-$(GCC_X_VERSION).tar.gz
 	    --disable-libquadmath \
 	    --disable-nls \
 	    --disable-multilib
-# XXX use make all & make install here.  However building libgcc
-# fails, see 'broken-gcc.log'.
-	cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && PATH=$(ROOT)/fixed-gcc:$$PATH make all-gcc
-	cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && make install-gcc DESTDIR=$(ROOT)/stage3-chroot
+	cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && PATH=$(ROOT)/fixed-gcc:$$PATH make
+	cd riscv-gcc-riscv-gcc-$(GCC_X_VERSION)/build && make install DESTDIR=$(ROOT)/stage3-chroot
 
 gcc-$(GCC_X_VERSION).tar.gz:
 	rm -f $@ $@-t