2014-05-18 19:04:48 +00:00
|
|
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
2014-07-26 14:11:27 +00:00
|
|
|
Date: Sat, 26 Jul 2014 06:10:23 +0200
|
2014-05-18 19:04:48 +00:00
|
|
|
Subject: tools/Makefile: fix host tools build dependencies
|
|
|
|
|
|
|
|
|
|
diff --git a/tools/Makefile b/tools/Makefile
|
2016-12-20 00:09:53 +00:00
|
|
|
index d2fe2ffddf4b7207a937ca75efe1c2728e8067aa..c6cded8eccd81c422f99e7ee50754c4bc66decc7 100644
|
2014-05-18 19:04:48 +00:00
|
|
|
--- a/tools/Makefile
|
|
|
|
|
+++ b/tools/Makefile
|
2015-05-21 23:09:19 +00:00
|
|
|
@@ -95,10 +95,16 @@ define PrepareStaging
|
2014-05-18 19:04:48 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
# preparatory work
|
|
|
|
|
+ifneq ($(ARCH),)
|
|
|
|
|
+staging_prepared = $(STAGING_DIR)/.prepared
|
|
|
|
|
+
|
|
|
|
|
$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
|
|
|
|
|
$(call PrepareStaging,$(STAGING_DIR))
|
|
|
|
|
mkdir -p $(BUILD_DIR)/stamp
|
|
|
|
|
touch $@
|
|
|
|
|
+else
|
|
|
|
|
+staging_prepared :=
|
|
|
|
|
+endif
|
|
|
|
|
|
|
|
|
|
$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
|
|
|
|
|
$(call PrepareStaging,$(STAGING_DIR_HOST))
|
2015-05-21 23:09:19 +00:00
|
|
|
@@ -110,8 +116,8 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
|
2014-05-18 19:04:48 +00:00
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2015-05-21 23:09:19 +00:00
|
|
|
-$(curdir)//prepare = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared
|
|
|
|
|
-$(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared
|
|
|
|
|
+$(curdir)//prepare = $(staging_prepared) $(STAGING_DIR_HOST)/.prepared
|
|
|
|
|
+$(curdir)//compile = $(staging_prepared) $(STAGING_DIR_HOST)/.prepared
|
2014-05-18 19:04:48 +00:00
|
|
|
|
|
|
|
|
# prerequisites for the individual targets
|
|
|
|
|
$(curdir)/ := .config prereq
|
