[Buildroot] [PATCH] Fix 'make toolchain-external-reinstall'
Jérôme Pouiller
jezz at sysmic.org
Tue Sep 27 16:28:32 UTC 2016
toolchain-wrapper was not reinstalled on 'make
toolchain-external-reinstall'
In add, normalize variable name: s/TOOLCHAIN_BUILD_WRAPPER/TOOLCHAIN_WRAPPER_BUILD/
Signed-off-by: Jérôme Pouiller <jezz at sysmic.org>
---
toolchain/toolchain-external/toolchain-external.mk | 3 ++-
toolchain/toolchain-wrapper.mk | 12 ++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 6fd2742..e9e6340 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -787,9 +787,10 @@ define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO
fi
endef
-TOOLCHAIN_EXTERNAL_BUILD_CMDS = $(TOOLCHAIN_BUILD_WRAPPER)
+TOOLCHAIN_EXTERNAL_BUILD_CMDS = $(TOOLCHAIN_WRAPPER_BUILD)
define TOOLCHAIN_EXTERNAL_INSTALL_STAGING_CMDS
+ $(TOOLCHAIN_WRAPPER_INSTALL)
$(TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK)
$(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS)
$(TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS_BFIN_FDPIC)
diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk
index af39071..21690fd 100644
--- a/toolchain/toolchain-wrapper.mk
+++ b/toolchain/toolchain-wrapper.mk
@@ -30,11 +30,15 @@ ifeq ($(BR2_CCACHE_USE_BASEDIR),y)
TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"'
endif
-# For simplicity, build directly into the install location
-define TOOLCHAIN_BUILD_WRAPPER
- $(Q)mkdir -p $(HOST_DIR)/usr/bin
+define TOOLCHAIN_WRAPPER_BUILD
$(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \
-s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \
toolchain/toolchain-wrapper.c \
- -o $(HOST_DIR)/usr/bin/toolchain-wrapper
+ -o toolchain/toolchain-wrapper
+endef
+
+define TOOLCHAIN_WRAPPER_INSTALL
+ $(Q)mkdir -p $(HOST_DIR)/usr/bin
+ $(INSTALL) -m 0755 toolchain/toolchain-wrapper \
+ $(HOST_DIR)/usr/bin/toolchain-wrapper
endef
--
1.9.1
More information about the buildroot
mailing list