From cc3634187790d352684d892fd2bbdc9f2ba84925 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 30 Sep 2023 09:54:21 +0200 Subject: [PATCH] package/gcc/gcc-final: move hook further down The HOST_GCC_FINAL_M68K_LIBGCC_FIXUP hook is tweaking the staging directory. In preparation for additional rework, let's move it further down in the file so that the diff of the rework will be easier to look at. Signed-off-by: Thomas Petazzoni Signed-off-by: Romain Naour --- package/gcc/gcc-final/gcc-final.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index c6ed0e35b9..ae6aedb2e7 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -135,15 +135,6 @@ HOST_GCC_FINAL_POST_INSTALL_HOOKS += TOOLCHAIN_WRAPPER_INSTALL # -cc symlink to the wrapper is not created. HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS -# coldfire is not working without removing these object files from libgcc.a -ifeq ($(BR2_m68k_cf),y) -define HOST_GCC_FINAL_M68K_LIBGCC_FIXUP - find $(STAGING_DIR) -name libgcc.a -print | \ - while read t; do $(GNU_TARGET_NAME)-ar dv "$t" _ctors.o; done -endef -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_M68K_LIBGCC_FIXUP -endif - HOST_GCC_FINAL_LIBS = libgcc_s libatomic ifeq ($(BR2_INSTALL_LIBSTDCPP),y) @@ -199,4 +190,13 @@ define HOST_GCC_FINAL_INSTALL_LIBS endef HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBS +# coldfire is not working without removing these object files from libgcc.a +ifeq ($(BR2_m68k_cf),y) +define HOST_GCC_FINAL_M68K_LIBGCC_FIXUP + find $(STAGING_DIR) -name libgcc.a -print | \ + while read t; do $(GNU_TARGET_NAME)-ar dv "$t" _ctors.o; done +endef +HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_M68K_LIBGCC_FIXUP +endif + $(eval $(host-autotools-package))