summaryrefslogtreecommitdiffstats
path: root/llvm/tools
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre@debian.org>2018-03-29 09:44:09 +0000
committerSylvestre Ledru <sylvestre@debian.org>2018-03-29 09:44:09 +0000
commitf22ebb75994bec808c8ab75afb69c36c335669fd (patch)
tree85a19ccc1b0b2e62c386e91cdb379a695b2e257e /llvm/tools
parent32a27fc77a5b1e1aa8648f83f80132d125a82498 (diff)
downloadbcm5719-llvm-f22ebb75994bec808c8ab75afb69c36c335669fd.tar.gz
bcm5719-llvm-f22ebb75994bec808c8ab75afb69c36c335669fd.zip
Rename llvm library from libLLVM-X.Y to libLLVM-X
Summary: As we are only doing X.0.Z releases (not using the minor version), there is no need to keep -X.Y in the version. Like patch https://reviews.llvm.org/D41808, I propose that we rename libLLVM-7.0svn.so to libLLVM-7svn.so This patch will also rename downstream libraries like liblldb-7.0 to liblldb-7 Reviewers: axw, beanz, dim, hans Reviewed By: dim, hans Subscribers: mgorny, llvm-commits Differential Revision: https://reviews.llvm.org/D41869 llvm-svn: 328768
Diffstat (limited to 'llvm/tools')
-rw-r--r--llvm/tools/llvm-config/CMakeLists.txt2
-rw-r--r--llvm/tools/llvm-shlib/simple_version_script.map.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt
index f59402ac4b0..a0bd36c3731 100644
--- a/llvm/tools/llvm-config/CMakeLists.txt
+++ b/llvm/tools/llvm-config/CMakeLists.txt
@@ -37,7 +37,7 @@ set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}}
set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
set(LLVM_BUILD_SYSTEM cmake)
set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
-set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
+set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}")
set(LLVM_HAS_GLOBAL_ISEL "ON")
# Use the C++ link flags, since they should be a superset of C link flags.
diff --git a/llvm/tools/llvm-shlib/simple_version_script.map.in b/llvm/tools/llvm-shlib/simple_version_script.map.in
index e9515fe7862..d58a8b3abcd 100644
--- a/llvm/tools/llvm-shlib/simple_version_script.map.in
+++ b/llvm/tools/llvm-shlib/simple_version_script.map.in
@@ -1 +1 @@
-LLVM_@LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@ { global: *; };
+LLVM_@LLVM_VERSION_MAJOR@ { global: *; };
OpenPOWER on IntegriCloud