[test-suite] r266776 - cmake: Prefer llvm tools from compiler directory

[Matthias Braun via llvm-commits]

Author: matze
Date: Tue Apr 19 12:49:01 2016
New Revision: 266776

URL: http://llvm.org/viewvc/llvm-project?rev=266776&view=rev
Log:
cmake: Prefer llvm tools from compiler directory

We should preferably take llvm-size and llvm-profdata at the same path
as the clang binary.

Modified:
    test-suite/trunk/CMakeLists.txt

Modified: test-suite/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/CMakeLists.txt?rev=266776&r1=266775&r2=266776&view=diff
==============================================================================
--- test-suite/trunk/CMakeLists.txt (original)
+++ test-suite/trunk/CMakeLists.txt Tue Apr 19 12:49:01 2016
@@ -78,8 +78,11 @@ set(TEST_SUITE_RUN_UNDER "" CACHE STRING
 set(TEST_SUITE_RUN_TYPE "train" CACHE STRING
     "Type of benchmark inputs (may be test,train or ref)")
 
-find_program(TEST_SUITE_LLVM_SIZE NAMES "llvm-size")
-find_program(TEST_SUITE_LLVM_PROFDATA NAMES "llvm-profdata")
+get_filename_component(CMAKE_C_COMPILER_DIRECTORY ${CMAKE_C_COMPILER} DIRECTORY)
+find_program(TEST_SUITE_LLVM_SIZE NAMES "llvm-size"
+             HINTS ${CMAKE_C_COMPILER_DIRECTORY})
+find_program(TEST_SUITE_LLVM_PROFDATA NAMES "llvm-profdata"
+             HINTS ${CMAKE_C_COMPILER_DIRECTORY})
 mark_as_advanced(TEST_SUITE_LLVM_SIZE TEST_SUITE_LLVM_PROFDATA)
 
 # Enable profile generate mode in lit. Note that this does not automatically