summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib/interception
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2013-01-30 14:27:41 +0000
committerAlexey Samsonov <samsonov@google.com>2013-01-30 14:27:41 +0000
commit32832e61767f11d87f67fafa085f6860a9b3733f (patch)
tree50e7cf0c0a95bd70f21bf53a091b992821ff90c3 /compiler-rt/lib/interception
parentc500132a93dc74ec84c1a979ecaf890bcf08a8e8 (diff)
downloadbcm5719-llvm-32832e61767f11d87f67fafa085f6860a9b3733f.tar.gz
bcm5719-llvm-32832e61767f11d87f67fafa085f6860a9b3733f.zip
[Sanitizer] include sanitizer_common headers when building interception library
llvm-svn: 173930
Diffstat (limited to 'compiler-rt/lib/interception')
-rw-r--r--compiler-rt/lib/interception/CMakeLists.txt2
-rw-r--r--compiler-rt/lib/interception/Makefile.mk1
-rw-r--r--compiler-rt/lib/interception/interception.h2
3 files changed, 4 insertions, 1 deletions
diff --git a/compiler-rt/lib/interception/CMakeLists.txt b/compiler-rt/lib/interception/CMakeLists.txt
index f456a25425e..d516e600f3a 100644
--- a/compiler-rt/lib/interception/CMakeLists.txt
+++ b/compiler-rt/lib/interception/CMakeLists.txt
@@ -10,6 +10,8 @@ set(MACH_OVERRIDE_SOURCES
mach_override/mach_override.c
)
+include_directories(..)
+
# Only add this C file if we're building on a Mac. Other source files can be
# harmlessly compiled on any platform, but the C file is complained about due
# to pedantic rules about empty translation units.
diff --git a/compiler-rt/lib/interception/Makefile.mk b/compiler-rt/lib/interception/Makefile.mk
index 1412a016f80..19d289f3d06 100644
--- a/compiler-rt/lib/interception/Makefile.mk
+++ b/compiler-rt/lib/interception/Makefile.mk
@@ -18,6 +18,7 @@ Implementation := Generic
# FIXME: use automatic dependencies?
Dependencies := $(wildcard $(Dir)/*.h)
Dependencies += $(wildcard $(Dir)/mach_override/*.h)
+Dependencies += $(wildcard $(Dir)/../sanitizer_common/*.h)
# Define a convenience variable for all the interception functions.
InterceptionFunctions := $(Sources:%.cc=%)
diff --git a/compiler-rt/lib/interception/interception.h b/compiler-rt/lib/interception/interception.h
index 63c5a0034d5..bff8104bd69 100644
--- a/compiler-rt/lib/interception/interception.h
+++ b/compiler-rt/lib/interception/interception.h
@@ -19,7 +19,7 @@
# error "Interception doesn't work on this operating system."
#endif
-#include "../sanitizer_common/sanitizer_internal_defs.h"
+#include "sanitizer_common/sanitizer_internal_defs.h"
// These typedefs should be used only in the interceptor definitions to replace
// the standard system types (e.g. SSIZE_T instead of ssize_t)
OpenPOWER on IntegriCloud