From 128c43a2d6308668032b285ca08228bebf26e74e Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 25 Jan 2018 10:41:27 +0100 Subject: LIBC_SLIBDIR_RTLDDIR: substitute arguments in single quotes The arguments of the LIBC_SLIBDIR_RTLDDIR macro are used both in unquoted and single quoted context, so that neither shell nor makefile variable references work. Consistently put them in single quotes so that they can refer to makefile variables. --- sysdeps/unix/sysv/linux/aarch64/configure | 4 ++-- sysdeps/unix/sysv/linux/mips/configure | 8 ++++---- sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | 4 ++-- sysdeps/unix/sysv/linux/s390/s390-64/configure | 4 ++-- sysdeps/unix/sysv/linux/sparc/sparc64/configure | 4 ++-- sysdeps/unix/sysv/linux/tile/configure | 4 ++-- sysdeps/unix/sysv/linux/x86_64/64/configure | 4 ++-- sysdeps/unix/sysv/linux/x86_64/x32/configure | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/aarch64/configure b/sysdeps/unix/sysv/linux/aarch64/configure index f48472c..27d50e1 100644 --- a/sysdeps/unix/sysv/linux/aarch64/configure +++ b/sysdeps/unix/sysv/linux/aarch64/configure @@ -6,8 +6,8 @@ arch_minimum_kernel=3.7.0 test -n "$libc_cv_slibdir" || case "$prefix" in /usr | /usr/) - libc_cv_slibdir=/lib64 - libc_cv_rtlddir=/lib + libc_cv_slibdir='/lib64' + libc_cv_rtlddir='/lib' if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; # Locale data can be shared between 32-bit and 64-bit libraries. diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure index a5513fa..1ee7f41 100644 --- a/sysdeps/unix/sysv/linux/mips/configure +++ b/sysdeps/unix/sysv/linux/mips/configure @@ -442,8 +442,8 @@ mips/mips64/n64/*) test -n "$libc_cv_slibdir" || case "$prefix" in /usr | /usr/) - libc_cv_slibdir=/lib64 - libc_cv_rtlddir=/lib64 + libc_cv_slibdir='/lib64' + libc_cv_rtlddir='/lib64' if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; # Locale data can be shared between 32-bit and 64-bit libraries. @@ -456,8 +456,8 @@ mips/mips64/n32/*) test -n "$libc_cv_slibdir" || case "$prefix" in /usr | /usr/) - libc_cv_slibdir=/lib32 - libc_cv_rtlddir=/lib32 + libc_cv_slibdir='/lib32' + libc_cv_rtlddir='/lib32' if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib32'; # Locale data can be shared between 32-bit and 64-bit libraries. diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure index 4e7fcf1..ae7f254 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure @@ -4,8 +4,8 @@ test -n "$libc_cv_slibdir" || case "$prefix" in /usr | /usr/) - libc_cv_slibdir=/lib64 - libc_cv_rtlddir=/lib64 + libc_cv_slibdir='/lib64' + libc_cv_rtlddir='/lib64' if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; # Locale data can be shared between 32-bit and 64-bit libraries. diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/configure b/sysdeps/unix/sysv/linux/s390/s390-64/configure index 7392cdf..e8e8436 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/configure +++ b/sysdeps/unix/sysv/linux/s390/s390-64/configure @@ -4,8 +4,8 @@ test -n "$libc_cv_slibdir" || case "$prefix" in /usr | /usr/) - libc_cv_slibdir=/lib64 - libc_cv_rtlddir=/lib + libc_cv_slibdir='/lib64' + libc_cv_rtlddir='/lib' if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; # Locale data can be shared between 32-bit and 64-bit libraries. diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/configure b/sysdeps/unix/sysv/linux/sparc/sparc64/configure index 8f88eff..4b92a40 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/configure +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/configure @@ -4,8 +4,8 @@ test -n "$libc_cv_slibdir" || case "$prefix" in /usr | /usr/) - libc_cv_slibdir=/lib64 - libc_cv_rtlddir=/lib64 + libc_cv_slibdir='/lib64' + libc_cv_rtlddir='/lib64' if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; # Locale data can be shared between 32-bit and 64-bit libraries. diff --git a/sysdeps/unix/sysv/linux/tile/configure b/sysdeps/unix/sysv/linux/tile/configure index 63f9686..32ce16c 100644 --- a/sysdeps/unix/sysv/linux/tile/configure +++ b/sysdeps/unix/sysv/linux/tile/configure @@ -8,8 +8,8 @@ tile/tilegx32) test -n "$libc_cv_slibdir" || case "$prefix" in /usr | /usr/) - libc_cv_slibdir=/lib32 - libc_cv_rtlddir=/lib32 + libc_cv_slibdir='/lib32' + libc_cv_rtlddir='/lib32' if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib32'; # Locale data can be shared between 32-bit and 64-bit libraries. diff --git a/sysdeps/unix/sysv/linux/x86_64/64/configure b/sysdeps/unix/sysv/linux/x86_64/64/configure index 9d1a8d2..9d298fa 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/configure +++ b/sysdeps/unix/sysv/linux/x86_64/64/configure @@ -4,8 +4,8 @@ test -n "$libc_cv_slibdir" || case "$prefix" in /usr | /usr/) - libc_cv_slibdir=/lib64 - libc_cv_rtlddir=/lib64 + libc_cv_slibdir='/lib64' + libc_cv_rtlddir='/lib64' if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/lib64'; # Locale data can be shared between 32-bit and 64-bit libraries. diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/configure b/sysdeps/unix/sysv/linux/x86_64/x32/configure index 1417da4..4837a30 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/configure +++ b/sysdeps/unix/sysv/linux/x86_64/x32/configure @@ -6,8 +6,8 @@ arch_minimum_kernel=3.4.0 test -n "$libc_cv_slibdir" || case "$prefix" in /usr | /usr/) - libc_cv_slibdir=/libx32 - libc_cv_rtlddir=/libx32 + libc_cv_slibdir='/libx32' + libc_cv_rtlddir='/libx32' if test "$libdir" = '${exec_prefix}/lib'; then libdir='${exec_prefix}/libx32'; # Locale data can be shared between 32-bit and 64-bit libraries. -- cgit v1.1