diff options
| author | Alexander Shaposhnikov <shal1t712@gmail.com> | 2016-12-31 05:25:52 +0000 |
|---|---|---|
| committer | Alexander Shaposhnikov <shal1t712@gmail.com> | 2016-12-31 05:25:52 +0000 |
| commit | 021fcf99fa531ede83709ea6efa6dcef9e9690de (patch) | |
| tree | 8080a95194a655453ab0896e760305e8763929a6 /utils | |
| parent | ff65ccf9af58b5763922ba061dd9237b76904c42 (diff) | |
[clang] Fix clean build of generate-order-file
This diff fixes the clean build of the target generate-order-file.
In llvm/tools/clang/CMakeLists.txt
add_subdirectory(utils/perf-training) should go after the block where
the value of the variable CLANG_ORDER_FILE is set - otherwise
(tested with cmake's version 3.6.2) the arguments of perf-helper.py gen-order-file
will be ill-formed (CLANG_ORDER_FILE will be empty).
Differential revision: https://reviews.llvm.org/D28153
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@290781 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/perf-training/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/utils/perf-training/CMakeLists.txt b/utils/perf-training/CMakeLists.txt index 07d9024610..c046a1dac4 100644 --- a/utils/perf-training/CMakeLists.txt +++ b/utils/perf-training/CMakeLists.txt @@ -40,7 +40,7 @@ if(LLVM_BUILD_INSTRUMENTED) endif() find_program(DTRACE dtrace) -if(DTRACE) +if(APPLE AND DTRACE) configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/order-files.lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/order-files/lit.site.cfg @@ -56,6 +56,10 @@ if(DTRACE) COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/perf-helper.py clean ${CMAKE_CURRENT_BINARY_DIR} dtrace COMMENT "Clearing old dtrace data") + if(NOT CLANG_ORDER_FILE) + message(FATAL_ERROR "Output clang order file is not set") + endif() + add_custom_target(generate-order-file COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/perf-helper.py gen-order-file --binary $<TARGET_FILE:clang> --output ${CLANG_ORDER_FILE} ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating order file" |