diff mbox series

build: Check that -lzstd can be linked

Message ID yddmt3xui33.fsf@CeBiTec.Uni-Bielefeld.DE
State Committed
Commit b0248580b68d970788bb43ac3ab8fe3e21ef71be
Headers
Series build: Check that -lzstd can be linked |

Commit Message

Rainer Orth March 28, 2023, 1:21 p.m. UTC 
  Recent Solaris 11.4 SRUs bundle zstd, but only the 64-bit libraries (no
idea why).  Because of this, in 32-bit builds cc1 etc. fail to link with
undefined references to various ZSTD_* functions from lto-compress.o.
This happens because currently only the presence of <zstd.h> is
necessary to enable zstd support in lto-compress.cc etc.

This patch checks for libzstd first and disables zstd support if
missing.

Tested on sparc-sun-solaris2.11 with the system installation of zstd
(64-bit only) and a locally-compiled one (specified with --with-zstd).

Ok for trunk?

* Setting the cache variable first might be considered a hack:
  alternatively, one could use AC_LINK_IFELSE instead of
  AC_COMPILE_IFELSE, adjusting the test program accordingly.

* All the code withing

  if test "x$with_zstd" != xno; then

  lacks indentation, which makes it harder to read.  I've left that out
  of this patch, though.

	Rainer

Comments

Jeff Law April 2, 2023, 9:15 p.m. UTC | #1 
On 3/28/23 07:21, Rainer Orth wrote:
> Recent Solaris 11.4 SRUs bundle zstd, but only the 64-bit libraries (no
> idea why).  Because of this, in 32-bit builds cc1 etc. fail to link with
> undefined references to various ZSTD_* functions from lto-compress.o.
> This happens because currently only the presence of <zstd.h> is
> necessary to enable zstd support in lto-compress.cc etc.
> 
> This patch checks for libzstd first and disables zstd support if
> missing.
> 
> Tested on sparc-sun-solaris2.11 with the system installation of zstd
> (64-bit only) and a locally-compiled one (specified with --with-zstd).
> 
> Ok for trunk?
OK
jeff
diff mbox series

Patch

diff --git a/gcc/configure.ac b/gcc/configure.ac
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1494,6 +1494,14 @@  fi
 CXXFLAGS="$CXXFLAGS $ZSTD_CPPFLAGS"
 LDFLAGS="$LDFLAGS $ZSTD_LDFLAGS"
 
+# LTO can use zstd compression algorithm
+save_LIBS="$LIBS"
+LIBS=
+AC_SEARCH_LIBS(ZSTD_compress, zstd,, gcc_cv_header_zstd_h=no)
+ZSTD_LIB="$LIBS"
+LIBS="$save_LIBS"
+AC_SUBST(ZSTD_LIB)
+
 AC_MSG_CHECKING(for zstd.h)
 AC_CACHE_VAL(gcc_cv_header_zstd_h,
 # We require version 1.3.0 or later.  This is the first version that has
@@ -1512,14 +1520,6 @@  if test $gcc_cv_header_zstd_h = yes; the
 elif test "x$with_zstd" != x; then
     as_fn_error $? "Unable to find zstd.h.  See config.log for details." "$LINENO" 5
 fi
-
-# LTO can use zstd compression algorithm
-save_LIBS="$LIBS"
-LIBS=
-AC_SEARCH_LIBS(ZSTD_compress, zstd)
-ZSTD_LIB="$LIBS"
-LIBS="$save_LIBS"
-AC_SUBST(ZSTD_LIB)
 fi
 
 dnl Disabled until we have a complete test for buggy enum bitfields.