From 7dd1c36cd72cd93f82563c17ef71eb2b881101d3 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sat, 30 Mar 2019 14:38:51 +0000 Subject: [PATCH] [cmake] Change deprecated $ to $. NFC See rL357338 for a similar change. The informational expression $ has been deprecated since CMake 3.0 llvm-svn: 357348 --- clang/runtime/CMakeLists.txt | 2 +- compiler-rt/cmake/Modules/AddCompilerRT.cmake | 2 +- llvm/tools/llvm-config/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt index 0bb0a0a..e1e52b0 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt @@ -18,7 +18,7 @@ function(get_ext_project_build_command out_var target) set(${out_var} "$(MAKE)" "${target}" PARENT_SCOPE) else() set(${out_var} ${CMAKE_COMMAND} --build . --target ${target} - --config $ PARENT_SCOPE) + --config $ PARENT_SCOPE) endif() endfunction() diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index d91c24f..bed0826 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -615,7 +615,7 @@ macro(add_custom_libcxx name prefix) set(run_clean "$(MAKE)" "-C" "${BINARY_DIR}" "clean") else() set(run_clean ${CMAKE_COMMAND} --build ${BINARY_DIR} --target clean - --config "$") + --config "$") endif() ExternalProject_Add_Step(${name} clean diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt index fc3dbaa..7788228 100644 --- a/llvm/tools/llvm-config/CMakeLists.txt +++ b/llvm/tools/llvm-config/CMakeLists.txt @@ -78,7 +78,7 @@ if(CMAKE_CROSSCOMPILING AND NOT LLVM_CONFIG_PATH) set(LLVM_CONFIG_PATH "${LLVM_NATIVE_BUILD}/bin/llvm-config" CACHE STRING "") add_custom_command(OUTPUT "${LLVM_CONFIG_PATH}" - COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $ + COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $ DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt WORKING_DIRECTORY ${LLVM_NATIVE_BUILD} COMMENT "Building native llvm-config..." -- 2.7.4