[source] toolchain: remove separate prepare/ step

LEDE Commits lede-commits at lists.infradead.org
Sat Feb 11 06:39:16 PST 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/b2c66724d71aa252b2d21c9984e7866a025ffd86

commit b2c66724d71aa252b2d21c9984e7866a025ffd86
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Feb 9 19:46:41 2017 +0100

    toolchain: remove separate prepare/ step
    
    It was a leftover from an old obsoleted dependency chain
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 toolchain/Makefile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/toolchain/Makefile b/toolchain/Makefile
index ee74e54..6ee8811 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -43,22 +43,16 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
     $(curdir)/builddirs += $(LIBC)/headers gcc/minimal
     $(curdir)/gcc/minimal/compile:=$(curdir)/binutils/compile
     $(curdir)/kernel-headers/compile:=$(curdir)/gcc/minimal/compile
-    $(curdir)/gcc/initial/prepare:=$(curdir)/gcc/minimal/prepare
-    $(curdir)/$(LIBC)/prepare:=$(curdir)/$(LIBC)/headers/prepare
     $(curdir)/$(LIBC)/headers/compile:=$(curdir)/kernel-headers/compile
     $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/compile
   endif
 
   $(curdir)/gcc/initial/compile+=$(curdir)/binutils/compile
-  $(curdir)/gcc/final/prepare:=$(curdir)/gcc/initial/prepare
   $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/compile
   $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile
   $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/compile
-  $(curdir)/$(LIBC)/utils/prepare:=$(curdir)/$(LIBC)/headers/prepare
 endif
 
-$(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare)
-
 ifndef DUMP_TARGET_DB
 ifneq ($(ARCH),)
   $(TOOLCHAIN_DIR)/info.mk: .config
@@ -77,8 +71,7 @@ endif
 
 # prerequisites for the individual targets
 $(curdir)/ := .config prereq
-$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(tools/stamp-compile)
-$(curdir)//compile = $(1)/prepare
+$(curdir)//compile = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(tools/stamp-compile)
 
 ifndef DUMP_TARGET_DB
 $(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:



More information about the lede-commits mailing list