From f9e0f044c4a53c7afa1e3e71268d3dc3f8f51ff0 Mon Sep 17 00:00:00 2001 From: Tian Yuanhao Date: Fri, 18 Dec 2020 13:58:56 +0800 Subject: [PATCH] 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 Signed-off-by: Yann E. MORIN (cherry picked from commit 8d595c0d926d6b352b0e08366095bb92c7318c4c) Signed-off-by: Peter Korsgaard --- 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 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