Skip to content

[pull] swift/release/5.4 from apple:swift/release/5.4 #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 22, 2021
Merged

[pull] swift/release/5.4 from apple:swift/release/5.4 #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a82823
Add minor version to libclang.so and libclang-cpp.so SONAME
tstellar Jan 21, 2021
4e3fc39
Merge commit '3a8282376b6c' from llvm.org/release/11.x into apple/sta…
Jan 21, 2021
41c42bb
Merge commit '4e3fc39b038f' from apple/stable/20200714 into swift/rel…
Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ set(CLANG_EXECUTABLE_VERSION
"${CLANG_VERSION_MAJOR}" CACHE STRING
"Major version number that will be appended to the clang executable name")
set(LIBCLANG_LIBRARY_VERSION
"${CLANG_VERSION_MAJOR}" CACHE STRING
"${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}" CACHE STRING
"Major version number that will be appended to the libclang library")
mark_as_advanced(CLANG_EXECUTABLE_VERSION LIBCLANG_LIBRARY_VERSION)

Expand Down
5 changes: 5 additions & 0 deletions clang/tools/clang-shlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,8 @@ add_clang_library(clang-cpp
${_OBJECTS}
LINK_LIBS
${_DEPS})

set_target_properties(clang-cpp
PROPERTIES
VERSION ${LIBCLANG_LIBRARY_VERSION}
SOVERSION ${LIBCLANG_LIBRARY_VERSION})
1 change: 1 addition & 0 deletions clang/tools/libclang/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ if(ENABLE_SHARED)
else()
set_target_properties(libclang
PROPERTIES
SOVERSION ${LIBCLANG_LIBRARY_VERSION}
VERSION ${LIBCLANG_LIBRARY_VERSION}
DEFINE_SYMBOL _CINDEX_LIB_)
# FIXME: _CINDEX_LIB_ affects dllexport/dllimport on Win32.
Expand Down