[Buildroot] [git commit branch/2020.11.x] package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR
Peter Korsgaard
peter at korsgaard.com
Tue Dec 22 10:48:44 UTC 2020
commit: https://git.buildroot.net/buildroot/commit/?id=80c291079c09df31227b4f75c1a4b89fb75d4795
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.11.x
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 at aliyun.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
(cherry picked from commit 8d595c0d926d6b352b0e08366095bb92c7318c4c)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
package/pkg-golang.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
index 3813e1c406..d07242310d 100644
--- a/package/pkg-golang.mk
+++ b/package/pkg-golang.mk
@@ -121,7 +121,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
@@ -130,7 +130,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
More information about the buildroot
mailing list