aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-01-18 17:56:13 +0100
committerFelix Fietkau <nbd@nbd.name>2017-01-18 23:57:09 +0100
commit131db366a3785a72b6e742f1842d29c1ad200601 (patch)
tree120cf96c9cda355e076984d671cd19ef6d5bc5c2 /toolchain
parent7a523569f7f403cdd7c2074cc49920f1dd7ecc70 (diff)
downloadupstream-131db366a3785a72b6e742f1842d29c1ad200601.tar.gz
upstream-131db366a3785a72b6e742f1842d29c1ad200601.tar.bz2
upstream-131db366a3785a72b6e742f1842d29c1ad200601.zip
build: remove separate /install step for host builds
Reduces the number of recursive make invocations Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/Makefile45
1 files changed, 23 insertions, 22 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile
index 9f565d0e59..b2600217ec 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -7,21 +7,21 @@
# Main makefile for the toolchain
#
# Steps:
-# 1) toolchain/binutils/install
+# 1) toolchain/binutils/compile
# build & install binutils
-# 2) toolchain/gcc/minimal/install
+# 2) toolchain/gcc/minimal/compile
# build & install a minimal gcc, needed for steps 3 & 4
-# 3) toolchain/kernel-headers/install
+# 3) toolchain/kernel-headers/compile
# install kernel headers, needed for step 4
-# 4) toolchain/libc/headers/install
+# 4) toolchain/libc/headers/compile
# build & install libc headers & support files, needed for step 5
-# 5) toolchain/gcc/initial/install
+# 5) toolchain/gcc/initial/compile
# build & install an initial gcc, needed for step 6
-# 6) toolchain/libc/install
+# 6) toolchain/libc/compile
# build & install the final libc
-# 7) toolchain/gcc/final/install
+# 7) toolchain/gcc/final/compile
# build & install the final gcc
-# 8) toolchain/libc/utils/install
+# 8) toolchain/libc/utils/compile
# build & install libc utilities
#
# For musl, steps 2 and 4 are skipped, and step 3 is done after 5
@@ -37,28 +37,27 @@ endif
# builddir dependencies
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
ifdef CONFIG_USE_MUSL
- $(curdir)/kernel-headers/compile:=$(curdir)/gcc/initial/install
- $(curdir)/$(LIBC)/compile:=$(curdir)/kernel-headers/install
+ $(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/install
- $(curdir)/kernel-headers/compile:=$(curdir)/gcc/minimal/install
+ $(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/install
- $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/install
+ $(curdir)/$(LIBC)/headers/compile:=$(curdir)/kernel-headers/compile
+ $(curdir)/gcc/initial/compile:=$(curdir)/$(LIBC)/headers/compile
endif
- $(curdir)/gcc/initial/compile+=$(curdir)/binutils/install
+ $(curdir)/gcc/initial/compile+=$(curdir)/binutils/compile
$(curdir)/gcc/final/prepare:=$(curdir)/gcc/initial/prepare
- $(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
- $(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/install
- $(curdir)/$(LIBC)/utils/compile:=$(curdir)/gcc/final/install
+ $(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)
-$(curdir)/builddirs-install:=$($(curdir)/builddirs-compile)
ifndef DUMP_TARGET_DB
ifneq ($(ARCH),)
@@ -78,15 +77,17 @@ endif
# prerequisites for the individual targets
$(curdir)/ := .config prereq
-$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(tools/stamp-install)
+$(curdir)//prepare = $(STAGING_DIR)/.prepared $(TOOLCHAIN_DIR)/info.mk $(tools/stamp-compile)
$(curdir)//compile = $(1)/prepare
-$(curdir)//install = $(1)/compile
+$(curdir)//compile = $(1)/compile
ifndef DUMP_TARGET_DB
$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed:
endif
-$(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR)))
+$(curdir)/install: $(curdir)/compile
+
+$(eval $(call stampfile,$(curdir),toolchain,compile,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR)))
$(eval $(call stampfile,$(curdir),toolchain,check,$(TMP_DIR)/.build))
$(eval $(call subdir,$(curdir)))