aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/interception
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2012-11-15 16:00:47 +0000
committerH.J. Lu <hjl@gcc.gnu.org>2012-11-15 08:00:47 -0800
commitf64bcb29f5f44c2d8d4ec722dcd9df6c9c235968 (patch)
treebf476feb11427127af02fc0d5e9eb34e1b433b70 /libsanitizer/interception
parent671e554d87635473d6bc7afd72c9108d49fed404 (diff)
downloadgcc-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/interception')
-rw-r--r--libsanitizer/interception/Makefile.am3
-rw-r--r--libsanitizer/interception/Makefile.in3
2 files changed, 6 insertions, 0 deletions
diff --git a/libsanitizer/interception/Makefile.am b/libsanitizer/interception/Makefile.am
index 4fd200c..b92a180 100644
--- a/libsanitizer/interception/Makefile.am
+++ b/libsanitizer/interception/Makefile.am
@@ -1,5 +1,8 @@
AM_CPPFLAGS = -I $(top_srcdir)/include
+# 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
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
diff --git a/libsanitizer/interception/Makefile.in b/libsanitizer/interception/Makefile.in
index fa60646..a746ae5 100644
--- a/libsanitizer/interception/Makefile.in
+++ b/libsanitizer/interception/Makefile.in
@@ -203,6 +203,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I $(top_srcdir)/include
+
+# 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
noinst_LTLIBRARIES = libinterception.la