[openwrt/openwrt] toolchain: cleanup dependencies

LEDE Commits lede-commits at lists.infradead.org
Sat Feb 25 04:49:17 PST 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6a7cde15000832ce0164dc27d85822b2e2dd9fe6

commit 6a7cde15000832ce0164dc27d85822b2e2dd9fe6
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Wed Aug 10 17:56:41 2022 -0400

    toolchain: cleanup dependencies
    
    Reorganize dependencies between toolchain targets to save a line.
    This also puts them in a linear order which is easier to read.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 toolchain/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/toolchain/Makefile b/toolchain/Makefile
index 19b144ee36..60e3507250 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -34,8 +34,8 @@ $(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN)
 # builddir dependencies
 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   ifdef CONFIG_USE_MUSL
+    $(curdir)/gcc/initial/compile:=$(curdir)/binutils/compile
     $(curdir)/kernel-headers/compile:=$(curdir)/gcc/initial/compile
-    $(curdir)/$(LIBC)/compile:=$(curdir)/kernel-headers/compile
   else
     $(curdir)/builddirs += $(LIBC)/headers gcc/minimal
     $(curdir)/gcc/minimal/compile:=$(curdir)/binutils/compile
@@ -44,9 +44,8 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
     $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/compile
   endif
 
-  $(curdir)/gcc/initial/compile+=$(curdir)/binutils/compile
-  $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/compile
-  $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile $(curdir)/kernel-headers/compile
+  $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/compile $(curdir)/kernel-headers/compile
+  $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile
   $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/compile
 endif
 




More information about the lede-commits mailing list