diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2012-11-15 16:00:47 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2012-11-15 08:00:47 -0800 |
| commit | f64bcb29f5f44c2d8d4ec722dcd9df6c9c235968 (patch) | |
| tree | bf476feb11427127af02fc0d5e9eb34e1b433b70 /libsanitizer/asan | |
| parent | 671e554d87635473d6bc7afd72c9108d49fed404 (diff) | |
| download | gcc-f64bcb29f5f44c2d8d4ec722dcd9df6c9c235968.zip gcc-f64bcb29f5f44c2d8d4ec722dcd9df6c9c235968.tar.gz gcc-f64bcb29f5f44c2d8d4ec722dcd9df6c9c235968.tar.bz2 | |
Properly set MULTISUBDIR and gcc_version
* configure.ac: Properly set MULTISUBDIR.
* asan/Makefile.am (gcc_version): New.
* interception/Makefile.am (gcc_version): Likewise.
* sanitizer_common/Makefile.am (gcc_version): Likewise.
* configure: Regenerated.
* asan/Makefile.in: Likewise.
* interception/Makefile.in: Likewise.
* sanitizer_common/Makefile.in: Likewise.
From-SVN: r193534
Diffstat (limited to 'libsanitizer/asan')
| -rw-r--r-- | libsanitizer/asan/Makefile.am | 5 | ||||
| -rw-r--r-- | libsanitizer/asan/Makefile.in | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libsanitizer/asan/Makefile.am b/libsanitizer/asan/Makefile.am index c76c158..3da1db3 100644 --- a/libsanitizer/asan/Makefile.am +++ b/libsanitizer/asan/Makefile.am @@ -1,8 +1,11 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) +# May be used by toolexeclibdir. +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 -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config toolexeclib_LTLIBRARIES = libasan.la diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in index e4b2b5c..451490f 100644 --- a/libsanitizer/asan/Makefile.in +++ b/libsanitizer/asan/Makefile.in @@ -235,8 +235,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) + +# May be used by toolexeclibdir. +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) 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 -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config toolexeclib_LTLIBRARIES = libasan.la asan_files = \ asan_allocator.cc \ |