aboutsummaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorGravatar Yaroslav Syrytsia <me@ys.lc>2020-03-30 16:41:37 +0300
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-04-08 13:25:28 +0200
commit453352c32aafe131c10dfebe4b0b89c2845c51ff (patch)
tree9bab31f4b8e3c8e228ec35c3663c79802cc84ddf /toolchain
parenta757768497607b7a09a0c1357b50e711c12fecf1 (diff)
downloadbuildroot-453352c32aafe131c10dfebe4b0b89c2845c51ff.tar.gz
buildroot-453352c32aafe131c10dfebe4b0b89c2845c51ff.tar.bz2
Makefile: make-4.3 now longer un-escapes \# in macros
make-4.3 shipped with a backward incompatible change in how sharp signs are handled in macros. Previously, up to make 4.2, the sharp sign would always start a comment, unless backslash-escaped, even in a macro or a fucntion call. Now, the sharp sign is no longer starting a comment when it appears inside such a macro or function call. This behaviour was supposed to be in force since 3.81, but was not; 4.3 fixed the code to match the doc. As such, use of external toolchains is broken, as we use the sharp sign in the copy_toolchain_sysroot macro, in shell variable expansion to strip off any leading /: ${target\#/}. Fix that by applying the workaround suggested in the release annoucement [0], by using a variable to hold a sharp sign. [0] https://lists.gnu.org/archive/html/info-gnu/2020-01/msg00004.html Signed-off-by: Yaroslav Syrytsia <me@ys.lc> [yann.morin.1998@free.fr: - move the SHARP_SIGN definition out of Makefile and into support/ - expand the commit log ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit 35c5cf56d21a250f8c86443a84e0b32301a70665) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/helpers.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 2c2a987c3e..44d0c83d1e 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -119,12 +119,12 @@ copy_toolchain_sysroot = \
done ; \
for link in $$(find $(STAGING_DIR) -type l); do \
target=$$(readlink $${link}) ; \
- if [ "$${target}" == "$${target\#/}" ] ; then \
+ if [ "$${target}" == "$${target$(SHARP_SIGN)/}" ] ; then \
continue ; \
fi ; \
- relpath="$(call relpath_prefix,$${target\#/})" ; \
- echo "Fixing symlink $${link} from $${target} to $${relpath}$${target\#/}" ; \
- ln -sf $${relpath}$${target\#/} $${link} ; \
+ relpath="$(call relpath_prefix,$${target$(SHARP_SIGN)/})" ; \
+ echo "Fixing symlink $${link} from $${target} to $${relpath}$${target$(SHARP_SIGN)/}" ; \
+ ln -sf $${relpath}$${target$(SHARP_SIGN)/} $${link} ; \
done ; \
relpath="$(call relpath_prefix,$${ARCH_LIB_DIR})" ; \
if [ "$${relpath}" != "" ]; then \