summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer2024-03-04 22:45:15 +0000
committerMatthias Schiffer2024-03-04 22:45:15 +0000
commit2b46cbef8179b4a131bd008c520339441bc87c97 (patch)
treee725778f69f42e0180bd7dddb190716235f903b8
parentfe0081eecf43bfd92ac68aa0f3ce7165aaddb4f2 (diff)
downloadopenwrt-2b46cbef8179b4a131bd008c520339441bc87c97.tar.gz
build: do not depend on $(STAGING_DIR)/.prepared when in SDK
The dependency can't be satisfied when building using the SDK, breaking package builds. As the staging and bin dirs are distributed with the SDK archive, ignoring the dependency is fine when SDK is set. Fixes: fbb924abff8a ("build: add $(STAGING_DIR) and $(BIN_DIR) ...") Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-rw-r--r--package/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/Makefile b/package/Makefile
index 4663b41de4..d72ce09a81 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -59,6 +59,7 @@ $(curdir)/merge-index: $(curdir)/merge
(cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; )
ifndef SDK
+ $(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR)
$(curdir)/compile: $(curdir)/system/opkg/host/compile
endif
@@ -117,8 +118,6 @@ endif
$(curdir)/flags-install:= -j1
-$(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR)
-
$(eval $(call stampfile,$(curdir),package,prereq,.config))
$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
$(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))