Fixes XCC texinfo dependency
[akaros.git] / tools / compilers / gcc-glibc / Makefile
index 8d14028..0850d5f 100644 (file)
@@ -38,7 +38,7 @@ DESTDIR ?= /
 # Configuration parameters for make-riscv
 RISCV_ARCH := riscv
 RISCV_BINARY_PREFIX := $(RISCV_ARCH)-ros-
-RISCV_GCC_BUILD_FLAGS :=
+RISCV_GCC_BUILD_FLAGS := 
 RISCV_CFLAGS :=
 
 # Configuration parameters for x86
@@ -145,7 +145,6 @@ gcc-$(GCC_VERSION): gcc-$(GCC_VERSION).tar.bz2
        rm -rf gcc-$(GCC_VERSION)
        tar -jxf gcc-$(GCC_VERSION).tar.bz2
        $(MAKE) .gcc-ros-patch
-       patch --no-backup-if-mismatch -p1 < gcc-4.6.1-compile.patch
        patch --no-backup-if-mismatch -p0 < gcc-$(GCC_VERSION)-riscv.patch
 
 .gcc-ros-patch:
@@ -204,6 +203,7 @@ $(BINARY_PREFIX)gcc-stage2-builddir: gcc-$(GCC_VERSION)
                    --prefix=$(INSTDIR) \
                    --includedir=$(INSTDIR)/include \
                    --disable-werror;
+       echo "MAKEINFO = :" >> $(BINARY_PREFIX)binutils-builddir/Makefile;
        touch $@
 
 .$(BINARY_PREFIX)binutils-make: .$(BINARY_PREFIX)binutils-configure
@@ -250,6 +250,7 @@ $(BINARY_PREFIX)gcc-stage2-builddir: gcc-$(GCC_VERSION)
                --prefix=$(INSTDIR) \
                --with-headers=$(INSTDIR)/$(ARCH)-ros/include \
                $(GCC_BUILD_FLAGS);
+       echo "MAKEINFO = :" >> $(BINARY_PREFIX)gcc-stage1-builddir/Makefile;
        touch $@
 
 .$(BINARY_PREFIX)gcc-stage1-make: .$(BINARY_PREFIX)gcc-stage1-configure
@@ -298,6 +299,7 @@ $(BINARY_PREFIX)gcc-stage2-builddir: gcc-$(GCC_VERSION)
 
 .$(BINARY_PREFIX)ros-install-libs:
        cd $(ROSDIR); \
+       make userclean; \
        make TARGET_ARCH=$(ARCH) -j $(MAKE_JOBS) install-libs
 
 .$(BINARY_PREFIX)gcc-stage2-configure:
@@ -312,12 +314,13 @@ $(BINARY_PREFIX)gcc-stage2-builddir: gcc-$(GCC_VERSION)
                  --program-prefix=$(BINARY_PREFIX) \
                  --target=$(ARCH)-ros \
                  --prefix=$(INSTDIR) \
-                 --enable-languages=c,c++,go \
+                 --enable-languages=c,c++ \
                  $(GCC_BUILD_FLAGS) \
                  --without-libffi \
                  --with-__thread \
                  --with-headers=$(INSTDIR)/$(ARCH)-ros/include \
                  --disable-werror;
+       echo "MAKEINFO = :" >> $(BINARY_PREFIX)gcc-stage2-builddir/Makefile;
        touch $@
 
 .$(BINARY_PREFIX)gcc-stage2-make: .$(BINARY_PREFIX)gcc-stage2-configure