FS#78: Corrected gcc-static build. Thanks Mike

[toolchain.git] / Makefile

diff --git a/Makefile b/Makefile
index 833802ce84c186765a07da824e94081a34203bad..8a73eceea233bc9e542b156ca3baa94f95af2e70 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,26 @@ include vars.mk
 
 .PHONY: all clean distclean
 
-all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test
+all: filesystem linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test
 
 clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean test-clean
        rm -rf $(CROSSTOOLS) $(CLFS)
 
-distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean
+distclean: clean filesystem-clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean
+
+
+# Prepare the filessytem
+$(CLFS)/lib:
+       install -d $(CLFS)/lib
+       ln -s lib $(CLFS)/lib64
+       install -d $(CLFS)/usr/lib
+       ln -s lib $(CLFS)/usr/lib64
+       touch $(CLFS)/lib
+
+filesystem: $(CLFS)/lib
+
+filesystem-clean:
+       rm -rf $(CLFS)/lib* $(CLFS)/usr/lib*
 
 
 # LINUX HEADERS
@@ -99,7 +113,7 @@ libmpfr-distclean: libmpfr-clean
 
 # LIBMPC
 $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz:
-       wget -P $(WORK) -c http://www.multiprecision.org/mpc/download/mpc-$(LIBMPC_VERSION).tar.gz
+       wget -P $(WORK) -c https://ftp.gnu.org/gnu/mpc/mpc-$(LIBMPC_VERSION).tar.gz
 
 $(WORK)/mpc-$(LIBMPC_VERSION): $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz
        tar -C $(WORK) -xzf $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz
@@ -161,11 +175,11 @@ binutils-distclean: binutils-clean
 
 
 # GCC-STATIC
-$(WORK)/gcc-$(GCC_VERSION).tar.bz2:
-       wget -P $(WORK) -c ftp://gcc.gnu.org/pub/gcc/releases/gcc-$(GCC_VERSION)/gcc-$(GCC_VERSION).tar.bz2
+$(WORK)/gcc-$(GCC_VERSION).tar.xz:
+       wget -P $(WORK) -c ftp://gcc.gnu.org/pub/gcc/releases/gcc-$(GCC_VERSION)/gcc-$(GCC_VERSION).tar.xz 
 
-$(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.bz2
-       tar -C $(WORK) -xjf $(WORK)/gcc-$(GCC_VERSION).tar.bz2
+$(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.xz
+       tar -C $(WORK) -xf $(WORK)/gcc-$(GCC_VERSION).tar.xz
        touch $(WORK)/gcc-$(GCC_VERSION)
 
 $(WORK)/build-gcc-static: $(WORK)/gcc-$(GCC_VERSION)
@@ -192,7 +206,7 @@ gcc-static-clean:
        rm -rf $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
 
 gcc-static-distclean: gcc-static-clean
-       rm -f $(WORK)/gcc-$(GCC_VERSION).tar.bz2
+       rm -f $(WORK)/gcc-$(GCC_VERSION).tar.xz
 
 
 # GLIBC