This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH: PR 26473
- From: Mark Mitchell <mark at codesourcery dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 27 Feb 2006 16:43:49 -0800
- Subject: PATCH: PR 26473
- Reply-to: mark at codesourcery dot com
This patch fixes PR 24673 by using the idioms traditional in the
target libraries for putting header files in the right places. I tend
to agree with Ralf that idealls the top-level Makefile/configure
should set $includedir and such so that the target libraries could
simply use the standard variables, but that's not how it works now.
Tested on x86_64-unknown-linux-gnu, applied to the mainline and 4.1
branches.
As previously mentioned, this will be the last patch before 4.1.0;
please consider the branch completely frozen at this time.
--
Mark Mitchell
CodeSourcery
mark@codesourcery.com
(650) 331-3385 x713
2006-02-27 Mark Mitchell <mark@codesourcery.com>
PR 26473
* configure.ac (ACX_NONCANONICAL_TARGET): Use it.
* Makefile.am (target_noncanonical): Define.
(libsubincludedir): New variable.
(nobase_libsubinclude_HEADERS): Likewise.
(nobase_include_HEADERS): Remove.
* configure: Regenerated.
* Makefile.in: Likewise.
* aclocal.m4: Regenerated.
Index: configure.ac
===================================================================
--- configure.ac (revision 111412)
+++ configure.ac (working copy)
@@ -1,10 +1,12 @@
# Process this file with autoconf to produce a configure script, like so:
-# aclocal && autoconf && autoheader && automake
+#
+# aclocal -I .. -I ../config && autoconf && autoheader && automake
AC_PREREQ(2.59)
AC_INIT(libssp, 1.0)
AC_CONFIG_SRCDIR(ssp.c)
AC_CANONICAL_SYSTEM
+ACX_NONCANONICAL_TARGET
AM_INIT_AUTOMAKE
Index: Makefile.am
===================================================================
--- Makefile.am (revision 111412)
+++ Makefile.am (working copy)
@@ -23,7 +23,9 @@ AM_CFLAGS = -Wall
toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
-nobase_include_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h
+target_noncanonical = @target_noncanonical@
+libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
+nobase_libsubinclude_HEADERS = ssp/ssp.h ssp/string.h ssp/stdio.h ssp/unistd.h
libssp_la_SOURCES = \
ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \