aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Tian Yuanhao <tianyuanhao@aliyun.com>2020-12-18 13:58:56 +0800
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-12-22 11:48:49 +0100
commit9d8c5d41666fb83a0e29f98b5affba916501ab69 (patch)
treea18989e071028d98e6f67d6ace7ad223279f3d12
parent3f15816d79b7c2863a91de7e5b8ee196be95d596 (diff)
downloadbuildroot-9d8c5d41666fb83a0e29f98b5affba916501ab69.tar.gz
buildroot-9d8c5d41666fb83a0e29f98b5affba916501ab69.tar.bz2
package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR
When BR2_PER_PACKAGE_DIRECTORIES=y, $(TARGET_DIR) is evaluated as $(BASE_DIR)/target, but $$(TARGET_DIR) is evaluated as $(BASE_DIR)/per-package/$(PKG)_NAME/target. Signed-off-by: Tian Yuanhao <tianyuanhao@aliyun.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit 8d595c0d926d6b352b0e08366095bb92c7318c4c) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/pkg-golang.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
index 2494ce028c..51ed92c7af 100644
--- a/package/pkg-golang.mk
+++ b/package/pkg-golang.mk
@@ -141,7 +141,7 @@ endif
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
$$(foreach d,$$($(2)_INSTALL_BINS),\
- $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(TARGET_DIR)/usr/bin/$$(d)
+ $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d)
)
endef
endif
@@ -150,7 +150,7 @@ endif
ifndef $(2)_INSTALL_CMDS
define $(2)_INSTALL_CMDS
$$(foreach d,$$($(2)_INSTALL_BINS),\
- $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(HOST_DIR)/bin/$$(d)
+ $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d)
)
endef
endif