Skip to contentSkip to conversation

Pull request for branch for-2011.02/multilib-fix

GIT PULL New Thomas Petazzoni 2 participants 3 messages Dec 21, 2010

lore
Share & tools
lore
#0 lore raw

The following changes since commit 11ab05f53a16f635a27139b33170a9dadba9f3c5:
Peter Korsgaard (1):
qt: svg and multimedia modules depends on gui module as well

are available in the git repository at:

git://git.busybox.net/~tpetazzoni/git/buildroot for-2011.02/multilib-fix

Thomas Petazzoni (1):
toolchain: fix multilib symlink for external toolchains

 toolchain/helpers.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Thanks,

Signature · 1 line
Thomas Petazzoni
#1 lore raw

PATCH 1/1 toolchain: fix multilib symlink for external toolchains

ARCH_SUBDIR is a shell variable, so it should be referenced with $${ARCH_SUBDIR}. Without this, no symbolic link is created, and the external toolchain fails to work if the non-default multilib variant is used.

---
 toolchain/helpers.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
toolchain/helpers.mk +1 -1
index 9b37f3f..eb9d742 100644
@@ -96,7 +96,7 @@ copy_toolchain_sysroot = \
 		if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \
 			cp -a $${SYSROOT_DIR}/usr/include $(STAGING_DIR)/usr ; \
 		fi ; \
-		ln -s . $(STAGING_DIR)/$(ARCH_SUBDIR) ; \
+		ln -s . $(STAGING_DIR)/$${ARCH_SUBDIR} ; \
 	fi ; \
 	find $(STAGING_DIR) -type d | xargs chmod 755
 
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 1/1 toolchain: fix multilib symlink for external toolchains

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> ARCH_SUBDIR is a shell variable, so it should be referenced with Thomas> $${ARCH_SUBDIR}. Without this, no symbolic link is created, and the Thomas> external toolchain fails to work if the non-default multilib variant Thomas> is used.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard