diff options
| author | Andrew Burgess <andrew.burgess@embecosm.com> | 2020-01-30 12:18:13 +0000 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2020-02-01 00:34:28 +0000 |
| commit | 20fa702b32c7ec7a7215df322d3e8d19b79f2068 (patch) | |
| tree | ef94a140b5349a9762fb459769bde211c25aade3 /libcpp | |
| parent | d1a80303866061496e10702bbf05862e92ce8c55 (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 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 4 | ||||
| -rwxr-xr-x | libcpp/configure | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index f749622a5f7..e61700f7ee9 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,7 @@ +2020-02-01 Andrew Burgess <andrew.burgess@embecosm.com> + + * configure: Regenerate. + 2020-01-28 Nathan Sidwell <nathan@acm.org> PR preprocessor/93452 diff --git a/libcpp/configure b/libcpp/configure index 7e53cade210..11da199083b 100755 --- a/libcpp/configure +++ b/libcpp/configure @@ -7066,7 +7066,7 @@ fi done fi else - if x$lib_type = xauto || x$lib_type = xshared; then + if test "x$lib_type" = "xauto" || test "x$lib_type" = "xshared"; then LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" else |