From ce57b051ea75be9e680edc7283c0485ebbb05d83 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 13 Sep 2013 11:23:34 +0200
Subject: rebuild musl after full gcc is available

---
 toolchain/musl/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'toolchain/musl')

diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index b3e02b841..e75b8c607 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -17,16 +17,18 @@ $(WRKBUILD)/.headers:
 	touch $@
 
 $(WRKBUILD)/.compiled:
-	# reconfigure musl, otherwise linking with libgcc is disabled
+	$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
+	touch $@
+
+$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
+	# reconfigure musl, otherwise linking with libgcc or libgcc_eh is disabled
+	$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean
 	(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
 		./configure --prefix=/usr \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--disable-gcc-wrapper \
 	)
 	$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
-	touch $@
-
-$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	$(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install
 	touch $@
 
-- 
cgit v1.2.3