diff options
| author | Alexey Samsonov <samsonov@google.com> | 2012-04-23 13:27:47 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2012-04-23 13:27:47 +0000 |
| commit | 909888cda6417db5ca06199a5da51e3408fd35c5 (patch) | |
| tree | de3a2248ad1c5383e6080066caef3fe9cbf69922 /lib/asan | |
| parent | 0796393f2088e3b75c4110934451160eeb037fab (diff) | |
| download | compiler-rt-909888cda6417db5ca06199a5da51e3408fd35c5.tar.gz | |
[ASan] use CLANG_VERSION in Makefile (currently 3.2)
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@155350 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan')
| -rw-r--r-- | lib/asan/Makefile.old | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/asan/Makefile.old b/lib/asan/Makefile.old index c6954e576..fe5748023 100644 --- a/lib/asan/Makefile.old +++ b/lib/asan/Makefile.old @@ -58,6 +58,7 @@ ifeq ($(ARCH), arm) endif CLANG_FLAGS= +CLANG_VERSION=3.2 CLANG_BUILD=$(ROOT)/../../../../build/Release+Asserts CLANG_CC=$(CLANG_BUILD)/bin/clang $(CLANG_FLAGS) CLANG_CXX=$(CLANG_BUILD)/bin/clang++ $(CLANG_FLAGS) @@ -120,8 +121,8 @@ endif # This will build libasan on linux for both x86_64 and i386 in the # desired location. The Mac library is already build by the clang's make. -# $(CLANG_BUILD)/lib/clang/3.1/lib/$(OS)/libclang_rt.asan-$(ARCH).a -LIBASAN_INST_DIR=$(CLANG_BUILD)/lib/clang/3.2/lib/$(OS) +# $(CLANG_BUILD)/lib/clang/$(CLANG_VERSION)/lib/$(OS)/libclang_rt.asan-$(ARCH).a +LIBASAN_INST_DIR=$(CLANG_BUILD)/lib/clang/$(CLANG_VERSION)/lib/$(OS) LIBASAN_A=$(LIBASAN_INST_DIR)/libclang_rt.asan-$(ARCH).a BLACKLIST= |