[llvm-commits] [compiler-rt] r167722 - in /compiler-rt/trunk: CMakeLists.txt lib/asan/lit_tests/lit.cfg utils/

[Alexander Potapenko]

Author: glider
Date: Mon Nov 12 05:32:42 2012
New Revision: 167722

URL: http://llvm.org/viewvc/llvm-project?rev=167722&view=rev
Log:
[ASan] Remove llvm-symbolizer from compiler-rt/utils/
This is the first (1/2) part of a change that moves llvm-symbolizer to llvm/tools/, which will allow to build it
with both cmake and configure+make.

Removed:
    compiler-rt/trunk/utils/
Modified:
    compiler-rt/trunk/CMakeLists.txt
    compiler-rt/trunk/lib/asan/lit_tests/lit.cfg

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=167722&r1=167721&r2=167722&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Mon Nov 12 05:32:42 2012
@@ -146,9 +146,6 @@
 # Add the public header's directory to the includes for all of compiler-rt.
 include_directories(include)
 
-# Build utils before building compiler-rt library.
-add_subdirectory(utils)
-
 add_subdirectory(lib)
 
 if(LLVM_INCLUDE_TESTS)

Modified: compiler-rt/trunk/lib/asan/lit_tests/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/lit.cfg?rev=167722&r1=167721&r2=167722&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/lit.cfg (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/lit.cfg Mon Nov 12 05:32:42 2012
@@ -70,9 +70,9 @@
 # Setup path to external LLVM symbolizer to run AddressSanitizer output tests.
 llvm_obj_root = getattr(config, 'llvm_obj_root', None)
 if llvm_obj_root:
+  llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
   config.environment['LLVM_SYMBOLIZER_PATH'] = os.path.join(
-      config.llvm_obj_root, "projects", "compiler-rt", "utils",
-      "llvm-symbolizer", "llvm-symbolizer")
+      llvm_tools_dir, "llvm-symbolizer")
 
 # Setup path to symbolizer script.
 # FIXME: Instead we should copy this script to the build tree and point