Commit 777a28a8 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- add sequence-point for toplevel parallel builds: uClibc needs an initial gcc

parent 18d979c7

package/libfloat/libfloat.mk

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ $(STAGING_DIR)/lib/libfloat.so $(STAGING_DIR)/lib/libfloat.a: $(LIBFLOAT_DIR)/li 
	(cd $(TARGET_DIR)/lib; ln -snf libfloat.so.1 libfloat.so)

	(cd $(TARGET_DIR)/usr/lib; ln -snf /lib/libfloat.so libfloat.so)



libfloat: gcc_initial $(STAGING_DIR)/lib/libfloat.so

libfloat: $(gcc_initial) $(STAGING_DIR)/lib/libfloat.so



libfloat-clean:

	-$(MAKE) -C $(LIBFLOAT_DIR) clean

toolchain/gcc/gcc-uclibc-3.x.mk

+3 −1
Original line number Diff line number Diff line
@@ -206,10 +206,12 @@ $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured 
	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc

	touch $@



$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled

gcc_initial = $(GCC_BUILD_DIR1)/.installed

$(gcc_initial) $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled

	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc

	#rm -f $(STAGING_DIR)/bin/gccbug $(STAGING_DIR)/bin/gcov

	#rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc $(STAGING_DIR)/share/locale

	touch $(gcc_initial)



gcc_initial: uclibc-configured binutils $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc

toolchain/gcc/gcc-uclibc-4.x.mk

+3 −1
Original line number Diff line number Diff line
@@ -213,10 +213,12 @@ $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured 
	$(MAKE) -C $(GCC_BUILD_DIR1) all-gcc

	touch $@



$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled

gcc_initial = $(GCC_BUILD_DIR1)/.installed

$(gcc_initial) $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled

	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc

	#rm -f $(STAGING_DIR)/usr/bin/gccbug $(STAGING_DIR)/usr/bin/gcov

	#rm -rf $(STAGING_DIR)/usr/info $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc $(STAGING_DIR)/usr/share/locale

	touch $(gcc_initial)



gcc_initial: uclibc-configured binutils $(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc

toolchain/uClibc/uclibc.mk

+1 −2
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ else 
endif

	touch $@



$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET)

$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(gcc_initial) $(LIBFLOAT_TARGET)

	$(MAKE1) -C $(UCLIBC_DIR) \

		PREFIX= \

		DEVEL_PREFIX=/ \
@@ -382,7 +382,6 @@ ifeq ($(LINUX_HEADERS_IS_KERNEL),y) 
			$(STAGING_DIR)/usr/include/; \

	fi

else



	if [ ! -f $(STAGING_DIR)/usr/include/linux/version.h ]; then \

		cp -pLR $(LINUX_HEADERS_DIR)/include/asm \

			$(STAGING_DIR)/usr/include/; \