Il 11/12/2012 20:27, H.J. Lu ha scritto: > On Tue, Dec 11, 2012 at 6:36 AM, Paolo Bonzini <bonz...@gnu.org> wrote: > >> >> As a followup please check if AM_MAKEFLAGS is needed at all. >> >>>>> diff --git a/libsanitizer/Makefile.in b/libsanitizer/Makefile.in >>>>> index 21c2711..53e0be9 100644 >>>>> --- a/libsanitizer/Makefile.in >>>>> +++ b/libsanitizer/Makefile.in >> >> Please do not include regenerated files in the patch. >> >>>>> diff --git a/libsanitizer/asan/Makefile.am b/libsanitizer/asan/Makefile.am >>>>> index 3da1db3..45fb3b3 100644 >>>>> --- a/libsanitizer/asan/Makefile.am >>>>> +++ b/libsanitizer/asan/Makefile.am >>>>> @@ -5,6 +5,10 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) >>>>> >>>>> DEFS = -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS >>>>> -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DASAN_HAS_EXCEPTIONS=1 >>>>> -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0 -DASAN_NEEDS_SEGV=1 >>>>> AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic >>>>> -Wno-long-long -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer >>>>> -funwind-tables -fvisibility=hidden -Wno-variadic-macros >>>>> -Wno-c99-extensions >>>>> +## We require libstdc++-v3 to be in the same build tree. >>>>> +AM_CXXFLAGS += -I../../libstdc++-v3/include \ >>>>> + -I../../libstdc++-v3/include/$(target_noncanonical) \ >>>>> + -I$(srcdir)/../../libstdc++-v3/libsupc++ >> >> As a followup, please bring back the possibility to build libsanitizer >> standalone, also wrapping the chooice of flags to link to libstdc++-v3 >> in a new config/libstdc++-raw-cxx.m4 file. > > Done. > >> Bonus points for using this macro elsewhere in the tree. > > That will be a separate patch. > >>>>> ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config >>>>> >>>>> toolexeclib_LTLIBRARIES = libasan.la >>>>> @@ -64,8 +68,6 @@ AM_MAKEFLAGS = \ >>>>> "includedir=$(includedir)" \ >>>>> "AR=$(AR)" \ >>>>> "AS=$(AS)" \ >>>>> - "CC=$(CC)" \ >>>>> - "CXX=$(CXX)" \ >>>>> "LD=$(LD)" \ >>>>> "LIBCFLAGS=$(LIBCFLAGS)" \ >>>>> "NM=$(NM)" \ >> >> Same as above, and same for other .am files. >> >> >>>>> diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac >>>>> index 2d62ec4..9c73904 100644 >>>>> --- a/libsanitizer/configure.ac >>>>> +++ b/libsanitizer/configure.ac >>>>> @@ -19,6 +19,7 @@ AC_MSG_RESULT($version_specific_libs) >>>>> # Do not delete or change the following two lines. For why, see >>>>> # http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html >>>>> AC_CANONICAL_SYSTEM >>>>> +ACX_NONCANONICAL_TARGET >> >> Note that if you create a new macro, ACX_NONCANONICAL_TARGET should be >> AC_REQUIREd there. >> > > Here is the updated patch. OK to install? > > Thanks.
Ok.
