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 | fbadfddcf1ed97d4a89c047cee515cedf91b54e4 (patch) | |
| tree | c3c630c64f480bcc06e5dc29eb4012ef000dcb26 /compiler-rt | |
| parent | 4ac4e155822f5070ff354791d469d3cebe0671ae (diff) | |
| download | bcm5719-llvm-fbadfddcf1ed97d4a89c047cee515cedf91b54e4.tar.gz bcm5719-llvm-fbadfddcf1ed97d4a89c047cee515cedf91b54e4.zip | |
[ASan] use CLANG_VERSION in Makefile (currently 3.2)
llvm-svn: 155350
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/asan/Makefile.old | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/Makefile.old b/compiler-rt/lib/asan/Makefile.old index c6954e57672..fe57480239e 100644 --- a/compiler-rt/lib/asan/Makefile.old +++ b/compiler-rt/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= |
