diff options
| author | Will Dietz <wdietz2@illinois.edu> | 2013-08-28 15:53:17 +0000 |
|---|---|---|
| committer | Will Dietz <wdietz2@illinois.edu> | 2013-08-28 15:53:17 +0000 |
| commit | 1de40607ba0671e82e49be696dbd8a001b41f6f4 (patch) | |
| tree | 633553d18c3b17889fbd174c4798439cf55d9971 | |
| parent | 81b8120b555eedd578e0737d081d1f6d76cfc3b9 (diff) | |
| download | compiler-rt-1de40607ba0671e82e49be696dbd8a001b41f6f4.tar.gz compiler-rt-1de40607ba0671e82e49be696dbd8a001b41f6f4.tar.bz2 compiler-rt-1de40607ba0671e82e49be696dbd8a001b41f6f4.tar.xz | |
sanitizer_common: Use PYTHON_EXECUTABLE to choose appropriate python.
Fixes build on systems where 'python' is not python2.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@189486 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/Modules/SanitizerUtils.cmake | 3 | ||||
| -rw-r--r-- | lib/sanitizer_common/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | lib/sanitizer_common/scripts/check_lint.sh | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/cmake/Modules/SanitizerUtils.cmake b/cmake/Modules/SanitizerUtils.cmake index 7a4f8670..a443b191 100644 --- a/cmake/Modules/SanitizerUtils.cmake +++ b/cmake/Modules/SanitizerUtils.cmake @@ -12,7 +12,8 @@ macro(add_sanitizer_rt_symbols name) get_target_property(libfile ${name} LOCATION) set(symsfile "${libfile}.syms") add_custom_target(${name}-symbols ALL - COMMAND ${SANITIZER_GEN_DYNAMIC_LIST} ${libfile} ${ARGN} + COMMAND ${PYTHON_EXECUTABLE} + ${SANITIZER_GEN_DYNAMIC_LIST} ${libfile} ${ARGN} > ${symsfile} DEPENDS ${name} ${SANITIZER_GEN_DYNAMIC_LIST} ${ARGN} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt index e9d58652..7f7f23a7 100644 --- a/lib/sanitizer_common/CMakeLists.txt +++ b/lib/sanitizer_common/CMakeLists.txt @@ -105,6 +105,7 @@ if(UNIX) set(SANITIZER_LINT_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/scripts/check_lint.sh) add_custom_target(SanitizerLintCheck ALL COMMAND LLVM_CHECKOUT=${LLVM_MAIN_SRC_DIR} SILENT=1 TMPDIR= + PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} ${SANITIZER_LINT_SCRIPT} DEPENDS ${SANITIZER_LINT_SCRIPT} COMMENT "Running lint check for sanitizer sources..." diff --git a/lib/sanitizer_common/scripts/check_lint.sh b/lib/sanitizer_common/scripts/check_lint.sh index df4871b8..5bfc98b2 100755 --- a/lib/sanitizer_common/scripts/check_lint.sh +++ b/lib/sanitizer_common/scripts/check_lint.sh @@ -8,8 +8,10 @@ if [ "${LLVM_CHECKOUT}" == "" ]; then fi # Cpplint setup -cd ${SCRIPT_DIR} CPPLINT=${SCRIPT_DIR}/cpplint.py +if [ "${PYTHON_EXECUTABLE}" != "" ]; then + CPPLINT="${PYTHON_EXECUTABLE} ${CPPLINT}" +fi # Filters # TODO: remove some of these filters |