Make external toolchain relocatable
PATCH v3 1/1 Make external toolchain relocatable
The external toolchain wrapper sets sysroot etc. to an absolute path. By changing this to a relative path, it is possible to move the host directory to a different location and still have a working build system.
This only works for a downloaded external toolchain. For a pre-installed external toolchain, it is possible to move the host directory to a different location, but not the external toolchain directory (it does work if the external toolchain directory lies within the host directory). For an internal or crosstool-ng toolchain, there is no wrapper so updating the sysroot path should be done in a different way.
See http://lists.busybox.net/pipermail/buildroot/2012-February/050371.html
for information about others things to do to make the host directory relocatable.
---
v3: also make symlinks relative, as suggested by Samuel Martin
v2: rebased against current master (dc1d20acb)
package/Makefile.in | 4 +- toolchain/toolchain-external/ext-tool.mk | 16 +++-- .../toolchain-external/ext-toolchain-wrapper.c | 64 ++++++++++++++------ 3 files changed, 61 insertions(+), 23 deletions(-)
package/Makefile.in +2 -2
@@ -56,8 +56,8 @@ TARGET_ABI+=-mabi=spe -mfloat-gprs=double -Wa,-me500mc endif endif -STAGING_DIR=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/sysroot - +STAGING_SUBDIR = usr/$(GNU_TARGET_NAME)/sysroot +STAGING_DIR = $(HOST_DIR)/$(STAGING_SUBDIR) TARGET_OPTIMIZATION:=$(call qstrip,$(BR2_TARGET_OPTIMIZATION)) ifeq ($(BR2_OPTIMIZE_0),y)
toolchain/toolchain-external/ext-tool.mk +12 -4
@@ -122,9 +122,17 @@ endif TOOLCHAIN_EXTERNAL_CROSS=$(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX)- TOOLCHAIN_EXTERNAL_CC=$(TOOLCHAIN_EXTERNAL_CROSS)gcc TOOLCHAIN_EXTERNAL_CXX=$(TOOLCHAIN_EXTERNAL_CROSS)g++ -TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = \ - -DBR_CROSS_PATH='"$(TOOLCHAIN_EXTERNAL_BIN)/"' \ - -DBR_SYSROOT='"$(STAGING_DIR)"' +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS = -DBR_SYSROOT='"$(STAGING_SUBDIR)"' + +ifeq ($(filter $(HOST_DIR)/%,$(TOOLCHAIN_EXTERNAL_BIN)),) +# TOOLCHAIN_EXTERNAL_BIN points outside HOST_DIR => absolute path +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_ABS='"$(TOOLCHAIN_EXTERNAL_BIN)"' +else +# TOOLCHAIN_EXTERNAL_BIN points inside HOST_DIR => relative path +TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += \ + -DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"' +endif CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE)) CC_TARGET_CPU_:=$(call qstrip,$(BR2_GCC_TARGET_CPU))
@@ -434,7 +442,7 @@ $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(STAMP_DIR)/ext-toolchain-installed ln -sf $(@F) $$base; \ ;; \ *) \ - ln -sf $$i .; \ + ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ ;; \ esac; \ done ;
toolchain/toolchain-external/ext-toolchain-wrapper.c +47 -17
97 lines not on this page · raw message
Signature · 1 line
tg: (585a4b0..) t/relocate-ext-toolchain (depends on: master)
PATCH v3 1/1 Make external toolchain relocatable
2012/7/15 Arnout Vandecappelle (Essensium/Mind) <[email protected]>:
Quoted 12 lines
The external toolchain wrapper sets sysroot etc. to an absolute path. By changing this to a relative path, it is possible to move the host directory to a different location and still have a working build system.
This only works for a downloaded external toolchain. For a pre-installed external toolchain, it is possible to move the host directory to a different location, but not the external toolchain directory (it does work if the external toolchain directory lies within the host directory). For an internal or crosstool-ng toolchain, there is no wrapper so updating the sysroot path should be done in a different way.
Quoted 5 lines
See http://lists.busybox.net/pipermail/buildroot/2012-February/050371.html
for information about others things to do to make the host directory relocatable.
Also tested.
PATCH v3 1/1 Make external toolchain relocatable
In reply to Arnout Vandecappelle (Essensium/Mind)Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:
Arnout> The external toolchain wrapper sets sysroot etc. to an absolute path. Arnout> By changing this to a relative path, it is possible to move the host Arnout> directory to a different location and still have a working build Arnout> system.
Arnout> This only works for a downloaded external toolchain. For a Arnout> pre-installed external toolchain, it is possible to move the Arnout> host directory to a different location, but not the external Arnout> toolchain directory (it does work if the external toolchain Arnout> directory lies within the host directory). For an internal or Arnout> crosstool-ng toolchain, there is no wrapper so updating the Arnout> sysroot path should be done in a different way.
Arnout> See
Arnout> http://lists.busybox.net/pipermail/buildroot/2012-February/050371.html
Arnout> for information about others things to do to make the host Arnout> directory relocatable.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard