Fixes XCC texinfo dependency
[akaros.git] / tools / compilers / gcc-glibc / Makefile
index 9e9b95f..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
@@ -203,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
@@ -249,10 +250,10 @@ $(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
-       $(MAKE) .gcc-ros-patch
        # Put the - in front of make because it actually fails and
        # we don't want the whole make process to fail.
        # It appears to still work though since this is just stage 1 of compiling
@@ -289,7 +290,6 @@ $(BINARY_PREFIX)gcc-stage2-builddir: gcc-$(GCC_VERSION)
        touch $@
 
 .$(BINARY_PREFIX)glibc-make: .$(BINARY_PREFIX)glibc-configure
-       $(MAKE) .glibc-ros-patch
        cd $(BINARY_PREFIX)glibc-builddir; \
        make -j $(MAKE_JOBS)
 
@@ -299,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:
@@ -313,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