diff options
| -rw-r--r-- | clang/tools/driver/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | clang/tools/libclang/CMakeLists.txt | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt index ff3e9fc3d53..a57b22e0a26 100644 --- a/clang/tools/driver/CMakeLists.txt +++ b/clang/tools/driver/CMakeLists.txt @@ -83,10 +83,7 @@ if (APPLE) set(TOOL_INFO_UTI "${CLANG_VENDOR_UTI}") set(TOOL_INFO_VERSION "${CLANG_VERSION}") - if (LLVM_SUBMIT_VERSION) - set(TOOL_INFO_BUILD_VERSION - "${LLVM_SUBMIT_VERSION}.${LLVM_SUBMIT_SUBVERSION}") - endif() + set(TOOL_INFO_BUILD_VERSION "${LLVM_MAJOR_VERSION}.${LLVM_MINOR_VERSION}") set(TOOL_INFO_PLIST_OUT "${CMAKE_CURRENT_BINARY_DIR}/${TOOL_INFO_PLIST}") target_link_libraries(clang diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt index 06db70e61ad..cf088a9409c 100644 --- a/clang/tools/libclang/CMakeLists.txt +++ b/clang/tools/libclang/CMakeLists.txt @@ -109,12 +109,9 @@ if(ENABLE_SHARED) DEFINE_SYMBOL _CINDEX_LIB_) endif() - if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + if(APPLE) set(LIBCLANG_LINK_FLAGS " -Wl,-compatibility_version -Wl,1") - if (DEFINED ${LLVM_SUBMIT_VERSION}) - set(LIBCLANG_LINK_FLAGS - "${LIBCLANG_LINK_FLAGS} -Wl,-current_version -Wl,${LLVM_SUBMIT_VERSION}.${LLVM_SUBMIT_SUBVERSION}") - endif() + set(LIBCLANG_LINK_FLAGS "${LIBCLANG_LINK_FLAGS} -Wl,-current_version -Wl,${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}") set_property(TARGET libclang APPEND_STRING PROPERTY LINK_FLAGS ${LIBCLANG_LINK_FLAGS}) |
