diff options
| author | Michael Kuhn <gcc@ikkoku.de> | 2020-06-09 14:05:07 -0600 |
|---|---|---|
| committer | Jeff Law <law@redhat.com> | 2020-06-09 14:07:46 -0600 |
| commit | 776256757b3d12830e5449c41f1dd6c13fdf2868 (patch) | |
| tree | 3a9d1c3f92cd65e644e961eeefd85e9379ceec95 /gcc | |
| parent | 84fa38d20a65e6d0dd5707c275acdb5cad3ceb5a (diff) | |
| download | gcc-776256757b3d12830e5449c41f1dd6c13fdf2868.zip gcc-776256757b3d12830e5449c41f1dd6c13fdf2868.tar.gz gcc-776256757b3d12830e5449c41f1dd6c13fdf2868.tar.bz2 | |
When specifying a non-system prefix with --with-zstd, the build fails because the header and library cannot be found (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95005).
The attached patch fixes the problem and is what we use in Spack to
make GCC build with zstd support.
gcc/
* Makefile.in (ZSTD_INC): Define.
(ZSTD_LIB): Include ZSTD_LDFLAGS.
(CFLAGS-lto-compress.o): Add ZSTD_INC.
* configure.ac (ZSTD_CPPFLAGS, ZSTD_LDFLAGS): New variables for
AC_SUBST.
* configure: Rebuilt.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/Makefile.in | 5 | ||||
| -rwxr-xr-x | gcc/configure | 2 | ||||
| -rw-r--r-- | gcc/configure.ac | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index be11311..4f70c189 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1081,7 +1081,8 @@ GNATMAKE = @GNATMAKE@ # Libs needed (at present) just for jcf-dump. LDEXP_LIB = @LDEXP_LIB@ -ZSTD_LIB = @ZSTD_LIB@ +ZSTD_INC = @ZSTD_CPPFLAGS@ +ZSTD_LIB = @ZSTD_LDFLAGS@ @ZSTD_LIB@ # Likewise, for use in the tools that must run on this machine # even if we are cross-building GCC. @@ -2286,7 +2287,7 @@ CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ version.o: $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) # lto-compress.o needs $(ZLIBINC) added to the include flags. -CFLAGS-lto-compress.o += $(ZLIBINC) +CFLAGS-lto-compress.o += $(ZLIBINC) $(ZSTD_INC) CFLAGS-lto-streamer-in.o += -DTARGET_MACHINE=\"$(target_noncanonical)\" diff --git a/gcc/configure b/gcc/configure index 629c7c7..def9d9a 100755 --- a/gcc/configure +++ b/gcc/configure @@ -787,6 +787,8 @@ LTLIBICONV LIBICONV ZSTD_LIB ZSTD_INCLUDE +ZSTD_LDFLAGS +ZSTD_CPPFLAGS DL_LIB LDEXP_LIB EXTRA_GCC_LIBS diff --git a/gcc/configure.ac b/gcc/configure.ac index 9e7efd1..e769c9c 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1340,6 +1340,8 @@ AC_SUBST(ZSTD_INCLUDE) AC_SUBST(ZSTD_LIB) ZSTD_CPPFLAGS= ZSTD_LDFLAGS= +AC_SUBST(ZSTD_CPPFLAGS) +AC_SUBST(ZSTD_LDFLAGS) AC_ARG_WITH(zstd, [AS_HELP_STRING([--with-zstd=PATH], [specify prefix directory for installed zstd library. |