From 0062102109da4cef5b55ae634a7394dca3581c99 Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 24 Mar 2018 18:51:45 +0100 Subject: [PATCH] fix build prerequisites with make -j3 --- Makefile | 4 ++-- make/bootstrap.mk | 16 +++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 7c84b44..7293eaa 100755 --- a/Makefile +++ b/Makefile @@ -95,10 +95,10 @@ printenv: @echo help: - $(MAKE) printenv + make printenv toolcheck: - $(MAKE)/./toolchecker.mk + make/./toolchecker.mk update-self: git pull diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 87eea5d..d1c9da4 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -1,7 +1,7 @@ # makefile for bootstrap # bootstrap.mk -BOOTSTRAP = targetprefix $(BUILD_TMP) $(CROSS_BASE) $(HOSTPREFIX)/bin +BOOTSTRAP = targetprefix $(BUILD_TMP) $(CROSS_BASE) $(HOSTPREFIX) BOOTSTRAP += includes-and-libs modules BOOTSTRAP += $(TARGETPREFIX)/lib/libc.so.6 BOOTSTRAP += $(ARCHIVE) @@ -64,7 +64,7 @@ pkgconfig-preqs: # host pkg-config # $(D)/host_pkgconfig: $(HOSTPREFIX)/bin/pkg-config -$(HOSTPREFIX)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(HOST_PKGCONFIG_VER).tar.gz | $(HOSTPREFIX)/bin pkgconfig-preqs +$(HOSTPREFIX)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(HOST_PKGCONFIG_VER).tar.gz | $(HOSTPREFIX) pkgconfig-preqs $(START_BUILD) $(UNTAR)/pkg-config-$(HOST_PKGCONFIG_VER).tar.gz set -e; cd $(BUILD_TMP)/pkg-config-$(HOST_PKGCONFIG_VER); \ @@ -234,13 +234,11 @@ $(CROSS_BASE): mkdir -p $(CROSS_BASE) $(HOSTPREFIX): - mkdir $@ - -$(HOSTPREFIX)/bin: $(HOSTPREFIX) - mkdir $@ + mkdir -p $@ + mkdir -p $@/bin -$(HOSTPREFIX)/bin/get%.sh: | $(HOSTPREFIX)/bin - ln -sf $(BASE_DIR)/scripts/$(shell basename $@) $(HOSTPREFIX)/bin +$(HOSTPREFIX)/bin/get%.sh: | $(HOSTPREFIX) + ln -sf $(BASE_DIR)/scripts/$(shell basename $@) $(HOSTPREFIX) $(TARGETPREFIX)/lib: | $(TARGETPREFIX) mkdir -p $@ @@ -282,7 +280,7 @@ $(ARCHIVE): @false # helper target to create ccache links (make sure to have ccache installed in /usr/bin ;) -ccache: $(HOSTPREFIX)/bin +ccache: $(HOSTPREFIX) ln -sf /usr/bin/ccache $(HOSTPREFIX)/bin/cc ln -sf /usr/bin/ccache $(HOSTPREFIX)/bin/gcc ln -sf /usr/bin/ccache $(HOSTPREFIX)/bin/g++ -- 2.39.5