diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2012-07-15 01:12:05 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-02-05 15:06:31 +0100 |
| commit | befb9a3ee0c5994162f527d8ef763d57d68ec48e (patch) | |
| tree | 44a033a7d2a4582a4eb598fb1c443792e58d48e4 /toolchain/toolchain-external/ext-tool.mk | |
| parent | 1b2ab4a43c2090f6d2b9c6b96db5c9284783d329 (diff) | |
| download | buildroot-novena-befb9a3ee0c5994162f527d8ef763d57d68ec48e.tar.gz buildroot-novena-befb9a3ee0c5994162f527d8ef763d57d68ec48e.zip | |
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.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'toolchain/toolchain-external/ext-tool.mk')
| -rw-r--r-- | toolchain/toolchain-external/ext-tool.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index 452204b59..b477bc045 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -121,9 +121,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)) @@ -456,7 +464,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 ; |