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

diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk
index f1df6f82f078974927f17c99fb611ea6670764cd..6fe28cfdbda89cd64d14db936ff96080e5af091a 100644 (file)
--- a/package/libfloat/libfloat.mk
+++ b/package/libfloat/libfloat.mk
@@ -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

diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index da3b9ae189293fac305350af905d58aaeef61a2a..1dff9ebedc749a683ae0cf2ab01630e358575694 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -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
 

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 2fad23fd71d475761c3f594a27b01239c330cf0c..a420c7fac0baba63e4859c6a5b7db23be3c5b850 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -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
 

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index fbe7f0b44757f7bdff4a633c6980b2c5c21ab78f..6056d986ec9744ff04aeb76dc3a3b7b77326ac16 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -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/; \