瀏覽代碼

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 <[email protected]>
Matthias Schiffer 1 年之前
父節點
當前提交
2b46cbef81
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      package/Makefile

+ 1 - 2
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))