Message ID | 5f7b311395a44a98654df57f145bffc9ce90a6c9.1358379198.git.yann.morin.1998@free.fr |
---|---|
State | Changes Requested |
Headers | show |
On 16 January 2013 23:41, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > Thus, the failing step can be easily extracted by autobuilders, > to ease with post-mortem analysis. > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > --- > toolchain/gcc/gcc-uclibc-4.x.mk | 15 +++++++++++++++ > 1 files changed, 15 insertions(+), 0 deletions(-) > > diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk > index b0d741b..09d5dc1 100644 > --- a/toolchain/gcc/gcc-uclibc-4.x.mk > +++ b/toolchain/gcc/gcc-uclibc-4.x.mk > @@ -247,6 +247,7 @@ $(DL_DIR)/$(GCC_SOURCE): > > gcc-unpacked: $(GCC_DIR)/.patched > $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) > + $(Q)$(call MESSAGE,"Extracting gcc") > mkdir -p $(TOOLCHAIN_DIR) > rm -rf $(GCC_DIR) > $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) - > @@ -259,6 +260,7 @@ endif > > gcc-patched: $(GCC_DIR)/.patched > $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked > + $(Q)$(call MESSAGE,"Patching gcc") > # Apply any files named gcc-*.patch from the source directory to gcc > ifneq ($(wildcard $(GCC_PATCH_DIR)),) > support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch > @@ -279,6 +281,7 @@ endif > GCC_BUILD_DIR1:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-initial > > $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched > + $(Q)$(call MESSAGE,"Configuring gcc pass-1") > mkdir -p $(GCC_BUILD_DIR1) > (cd $(GCC_BUILD_DIR1); rm -rf config.cache; \ > $(HOST_CONFIGURE_OPTS) \ > @@ -314,6 +317,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched > touch $@ > > $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured > + $(Q)$(call MESSAGE,"Building gcc pass-1") > ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) > $(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc > else > @@ -323,6 +327,7 @@ endif > > gcc_initial=$(GCC_BUILD_DIR1)/.installed > $(gcc_initial) $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled > + $(Q)$(call MESSAGE,"Installing gcc pass-1") > PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc > touch $(gcc_initial) > > @@ -346,6 +351,7 @@ GCC_BUILD_DIR2:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-intermediate > # the step or libgcc will not build... > > $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched > + $(Q)$(call MESSAGE,"Configuring gcc pass-2") > mkdir -p $(GCC_BUILD_DIR2) > (cd $(GCC_BUILD_DIR2); rm -rf config.cache; \ > $(HOST_CONFIGURE_OPTS) \ > @@ -380,6 +386,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched > touch $@ > > $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured > + $(Q)$(call MESSAGE,"Building gcc pass-2") > # gcc >= 4.3.0 have to also build all-target-libgcc > ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) > $(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc all-target-libgcc > @@ -390,6 +397,7 @@ endif > > gcc_intermediate=$(GCC_BUILD_DIR2)/.installed > $(gcc_intermediate): $(GCC_BUILD_DIR2)/.compiled > + $(Q)$(call MESSAGE,"Installing gcc pass-2") > # gcc >= 4.3.0 have to also install install-target-libgcc > ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) > PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc install-target-libgcc > @@ -421,6 +429,7 @@ gcc_intermediate-dirclean: > > GCC_BUILD_DIR3:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-final > $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ) > + $(Q)$(call MESSAGE,"Configuring gcc final") > mkdir -p $(GCC_BUILD_DIR3) > # Important! Required for limits.h to be fixed. > ln -snf ../include/ $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sys-include > @@ -457,10 +466,12 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ) > touch $@ > > $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured > + $(Q)$(call MESSAGE,"Building gcc final") > $(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR3) all > touch $@ > > $(GCC_BUILD_DIR3)/.installed: $(GCC_BUILD_DIR3)/.compiled > + $(Q)$(call MESSAGE,"Installing gcc final") > PATH=$(TARGET_PATH) $(MAKE) \ > -C $(GCC_BUILD_DIR3) install > if [ -d "$(STAGING_DIR)/lib64" ]; then \ > @@ -492,6 +503,7 @@ endif > touch $@ > > $(STAMP_DIR)/gcc_libs_target_installed: $(GCC_BUILD_DIR3)/.installed > + $(Q)$(call MESSAGE,"Installing gcc final libraries to staging") > ifeq ($(BR2_GCC_SHARED_LIBGCC),y) > # These go in /lib, so... > rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* > @@ -548,6 +560,7 @@ $(GCC_BUILD_DIR4)/.prepared: $(STAMP_DIR)/gcc_libs_target_installed > touch $@ > > $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared > + $(Q)$(call MESSAGE,"Configuring gcc on target") > (cd $(GCC_BUILD_DIR4); rm -rf config.cache; \ > $(TARGET_CONFIGURE_OPTS) \ > $(TARGET_CONFIGURE_ARGS) \ > @@ -586,6 +599,7 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared > touch $@ > > $(GCC_BUILD_DIR4)/.compiled: $(GCC_BUILD_DIR4)/.configured > + $(Q)$(call MESSAGE,"Building gcc on target") > PATH=$(TARGET_PATH) \ > $(MAKE) -C $(GCC_BUILD_DIR4) all > touch $@ > @@ -598,6 +612,7 @@ GCC_INCLUDE_DIR:=include-fixed > endif > > $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled > + $(Q)$(call MESSAGE,"Installing gcc on target") > PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) \ > $(MAKE1) -C $(GCC_BUILD_DIR4) install > # Remove broken specs file (cross compile flag is set). > -- > 1.7.2.5 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot Looks good to me Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
On 01/17/13 00:41, Yann E. MORIN wrote: > Thus, the failing step can be easily extracted by autobuilders, > to ease with post-mortem analysis. > > Signed-off-by: "Yann E. MORIN"<yann.morin.1998@free.fr> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > toolchain/gcc/gcc-uclibc-4.x.mk | 15 +++++++++++++++ > 1 files changed, 15 insertions(+), 0 deletions(-) > [snip] > $(STAMP_DIR)/gcc_libs_target_installed: $(GCC_BUILD_DIR3)/.installed > + $(Q)$(call MESSAGE,"Installing gcc final libraries to staging") Target and staging, actually. Regards, Arnout > ifeq ($(BR2_GCC_SHARED_LIBGCC),y) > # These go in /lib, so... > rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* [snip]
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index b0d741b..09d5dc1 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -247,6 +247,7 @@ $(DL_DIR)/$(GCC_SOURCE): gcc-unpacked: $(GCC_DIR)/.patched $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) + $(Q)$(call MESSAGE,"Extracting gcc") mkdir -p $(TOOLCHAIN_DIR) rm -rf $(GCC_DIR) $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) - @@ -259,6 +260,7 @@ endif gcc-patched: $(GCC_DIR)/.patched $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked + $(Q)$(call MESSAGE,"Patching gcc") # Apply any files named gcc-*.patch from the source directory to gcc ifneq ($(wildcard $(GCC_PATCH_DIR)),) support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch @@ -279,6 +281,7 @@ endif GCC_BUILD_DIR1:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-initial $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched + $(Q)$(call MESSAGE,"Configuring gcc pass-1") mkdir -p $(GCC_BUILD_DIR1) (cd $(GCC_BUILD_DIR1); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ @@ -314,6 +317,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched touch $@ $(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured + $(Q)$(call MESSAGE,"Building gcc pass-1") ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) $(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc else @@ -323,6 +327,7 @@ endif gcc_initial=$(GCC_BUILD_DIR1)/.installed $(gcc_initial) $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled + $(Q)$(call MESSAGE,"Installing gcc pass-1") PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc touch $(gcc_initial) @@ -346,6 +351,7 @@ GCC_BUILD_DIR2:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-intermediate # the step or libgcc will not build... $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched + $(Q)$(call MESSAGE,"Configuring gcc pass-2") mkdir -p $(GCC_BUILD_DIR2) (cd $(GCC_BUILD_DIR2); rm -rf config.cache; \ $(HOST_CONFIGURE_OPTS) \ @@ -380,6 +386,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched touch $@ $(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured + $(Q)$(call MESSAGE,"Building gcc pass-2") # gcc >= 4.3.0 have to also build all-target-libgcc ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) $(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR2) all-gcc all-target-libgcc @@ -390,6 +397,7 @@ endif gcc_intermediate=$(GCC_BUILD_DIR2)/.installed $(gcc_intermediate): $(GCC_BUILD_DIR2)/.compiled + $(Q)$(call MESSAGE,"Installing gcc pass-2") # gcc >= 4.3.0 have to also install install-target-libgcc ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install-gcc install-target-libgcc @@ -421,6 +429,7 @@ gcc_intermediate-dirclean: GCC_BUILD_DIR3:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION)-final $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ) + $(Q)$(call MESSAGE,"Configuring gcc final") mkdir -p $(GCC_BUILD_DIR3) # Important! Required for limits.h to be fixed. ln -snf ../include/ $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sys-include @@ -457,10 +466,12 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ) touch $@ $(GCC_BUILD_DIR3)/.compiled: $(GCC_BUILD_DIR3)/.configured + $(Q)$(call MESSAGE,"Building gcc final") $(GCC_CONF_ENV) $(MAKE) -C $(GCC_BUILD_DIR3) all touch $@ $(GCC_BUILD_DIR3)/.installed: $(GCC_BUILD_DIR3)/.compiled + $(Q)$(call MESSAGE,"Installing gcc final") PATH=$(TARGET_PATH) $(MAKE) \ -C $(GCC_BUILD_DIR3) install if [ -d "$(STAGING_DIR)/lib64" ]; then \ @@ -492,6 +503,7 @@ endif touch $@ $(STAMP_DIR)/gcc_libs_target_installed: $(GCC_BUILD_DIR3)/.installed + $(Q)$(call MESSAGE,"Installing gcc final libraries to staging") ifeq ($(BR2_GCC_SHARED_LIBGCC),y) # These go in /lib, so... rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so* @@ -548,6 +560,7 @@ $(GCC_BUILD_DIR4)/.prepared: $(STAMP_DIR)/gcc_libs_target_installed touch $@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared + $(Q)$(call MESSAGE,"Configuring gcc on target") (cd $(GCC_BUILD_DIR4); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ @@ -586,6 +599,7 @@ $(GCC_BUILD_DIR4)/.configured: $(GCC_BUILD_DIR4)/.prepared touch $@ $(GCC_BUILD_DIR4)/.compiled: $(GCC_BUILD_DIR4)/.configured + $(Q)$(call MESSAGE,"Building gcc on target") PATH=$(TARGET_PATH) \ $(MAKE) -C $(GCC_BUILD_DIR4) all touch $@ @@ -598,6 +612,7 @@ GCC_INCLUDE_DIR:=include-fixed endif $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled + $(Q)$(call MESSAGE,"Installing gcc on target") PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) \ $(MAKE1) -C $(GCC_BUILD_DIR4) install # Remove broken specs file (cross compile flag is set).
Thus, the failing step can be easily extracted by autobuilders, to ease with post-mortem analysis. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> --- toolchain/gcc/gcc-uclibc-4.x.mk | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)