summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2020-01-30 12:18:13 +0000
committerAndrew Burgess <andrew.burgess@embecosm.com>2020-02-01 00:34:28 +0000
commit20fa702b32c7ec7a7215df322d3e8d19b79f2068 (patch)
treeef94a140b5349a9762fb459769bde211c25aade3 /config
parentd1a80303866061496e10702bbf05862e92ce8c55 (diff)
Fixes after recent configure changes relating to static libraries
This commit: commit e7c26e04b2dd6266d62d5a5825ff7eb44d1cf14e (tjteru/master) Date: Wed Jan 22 14:54:26 2020 +0000 gcc: Add new configure options to allow static libraries to be selected contains a couple of issues. First I failed to correctly regenerate all of the configure files it should have done. Second, there was a mistake in lib-link.m4, one of the conditions didn't use pure sh syntax, I wrote this: if x$lib_type = xauto || x$lib_type = xshared; then When I should have written this: if test "x$lib_type" = "xauto" || test "x$lib_type" = "xshared"; then These issues were raised on the mailing list in these messages: https://gcc.gnu.org/ml/gcc-patches/2020-01/msg01827.html https://gcc.gnu.org/ml/gcc-patches/2020-01/msg01921.html config/ChangeLog: * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Update shell syntax. gcc/ChangeLog: * configure: Regenerate. intl/ChangeLog: * configure: Regenerate. libcpp/ChangeLog: * configure: Regenerate. libstdc++-v3/ChangeLog: * configure: Regenerate.
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog4
-rw-r--r--config/lib-link.m42
2 files changed, 5 insertions, 1 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index fb339196a22..f1fec81a0ca 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-01 Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Update shell syntax.
+
2020-01-27 Andrew Burgess <andrew.burgess@embecosm.com>
* lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Add new
diff --git a/config/lib-link.m4 b/config/lib-link.m4
index 662192e0a07..20e281fd323 100644
--- a/config/lib-link.m4
+++ b/config/lib-link.m4
@@ -492,7 +492,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
dnl known to the linker and runtime loader. (All the system
dnl directories known to the linker should also be known to the
dnl runtime loader, otherwise the system is severely misconfigured.)
- if x$lib_type = xauto || x$lib_type = xshared; then
+ if test "x$lib_type" = "xauto" || test "x$lib_type" = "xshared"; then
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
else