From 49fb4a96e0b79e18aec0ed908676ae4ecaf3084b Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Mon, 11 Nov 2019 09:10:14 -0800 Subject: [PATCH] change LLVM_VERSION_SUFFIX default from svn to git Summary: Sayonara SVN! Signed-off-by: Nick Desaulniers Reviewers: tstellar, jyknight, lebedev.ri, smeenai, mgorny, hans, mclow.lists Reviewed By: mgorny, hans Subscribers: christof, libcxx-commits, llvm-commits, srhines Tags: #libc, #llvm Differential Revision: https://reviews.llvm.org/D70019 --- libcxx/CMakeLists.txt | 2 +- libunwind/CMakeLists.txt | 2 +- llvm/CMakeLists.txt | 2 +- llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn | 2 +- llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | 6 +++--- llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index cdb3b08..fe40954 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -27,7 +27,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUIL project(libcxx CXX C) set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 10.0.0svn) + set(PACKAGE_VERSION 10.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org") diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 3639585..25dc95c 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -83,7 +83,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_B endif() set(PACKAGE_NAME libunwind) - set(PACKAGE_VERSION 10.0.0svn) + set(PACKAGE_VERSION 10.0.0git) set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "llvm-bugs@lists.llvm.org") diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index ba8249c..2907386 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -25,7 +25,7 @@ if(NOT DEFINED LLVM_VERSION_PATCH) set(LLVM_VERSION_PATCH 0) endif() if(NOT DEFINED LLVM_VERSION_SUFFIX) - set(LLVM_VERSION_SUFFIX svn) + set(LLVM_VERSION_SUFFIX git) endif() if (NOT PACKAGE_VERSION) diff --git a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn index 61b8887..68f52eb 100644 --- a/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn +++ b/llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn @@ -30,7 +30,7 @@ write_cmake_config("Config") { "CLANG_CONFIG_FILE_USER_DIR=", "DEFAULT_SYSROOT=", "GCC_INSTALL_PREFIX=", - "BACKEND_PACKAGE_STRING=LLVM ${llvm_version}svn", + "BACKEND_PACKAGE_STRING=LLVM ${llvm_version}git", "ENABLE_LINKER_BUILD_ID=", "ENABLE_X86_RELAX_RELOCATIONS=", "ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER=", diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn index f09d8a2..83cfd98 100644 --- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn @@ -120,8 +120,8 @@ write_cmake_config("config") { "LLVM_VERSION_PRINTER_SHOW_HOST_TARGET_INFO=1", "PACKAGE_BUGREPORT=https://bugs.llvm.org/", "PACKAGE_NAME=LLVM", - "PACKAGE_STRING=LLVM ${llvm_version}svn", - "PACKAGE_VERSION=${llvm_version}svn", + "PACKAGE_STRING=LLVM ${llvm_version}git", + "PACKAGE_VERSION=${llvm_version}git", "PACKAGE_VENDOR=", "RETSIGTYPE=void", "LLVM_GISEL_COV_ENABLED=", @@ -340,7 +340,7 @@ write_cmake_config("llvm-config") { "LLVM_VERSION_MAJOR=$llvm_version_major", "LLVM_VERSION_MINOR=$llvm_version_minor", "LLVM_VERSION_PATCH=$llvm_version_patch", - "PACKAGE_VERSION=${llvm_version}svn", + "PACKAGE_VERSION=${llvm_version}git", "LLVM_FORCE_ENABLE_STATS=", ] diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn index 58334c8..c4fc77a 100644 --- a/llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn @@ -82,7 +82,7 @@ write_cmake_config("BuildVariables.inc") { "LLVM_LINK_LLVM_DYLIB=0", "BUILD_SHARED_LIBS=0", "LLVM_DYLIB_COMPONENTS_expanded=all", - "LLVM_DYLIB_VERSION=${llvm_version_major}svn", + "LLVM_DYLIB_VERSION=${llvm_version_major}git", "LLVM_HAS_GLOBAL_ISEL=1", "LLVM_TOOLS_INSTALL_DIR=", ] -- 2.7.4