From 4c85e72ad3288ea55f09924d73eb3c3f7aba8269 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Fri, 25 Jan 2019 22:45:17 +0000 Subject: [PATCH] Build LLVM-C.dll by default on windows and enable in release package With the fixes to the building of LLVM-C.dll in D56781 this should now be safe to land. This will greatly simplify dealing with LLVM for people that just want to use the C API on windows. This is a follow up from D35077. Patch by Jakob Bornecrantz! Differential revision: https://reviews.llvm.org/D56774 llvm-svn: 352250 --- llvm/CMakeLists.txt | 2 +- llvm/utils/release/build_llvm_package.bat | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 168ec6a6cffb..7a24c5cc4a57 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -534,7 +534,7 @@ if(NOT DEFINED LLVM_DYLIB_COMPONENTS) endif() option(LLVM_LINK_LLVM_DYLIB "Link tools against the libllvm dynamic library" OFF) if(MSVC) - option(LLVM_BUILD_LLVM_C_DYLIB "Build LLVM-C.dll (Windows only)" OFF) + option(LLVM_BUILD_LLVM_C_DYLIB "Build LLVM-C.dll (Windows only)" ON) else() option(LLVM_BUILD_LLVM_C_DYLIB "Build libllvm-c re-export library (Darwin only)" OFF) endif() diff --git a/llvm/utils/release/build_llvm_package.bat b/llvm/utils/release/build_llvm_package.bat index 8038d798aa0a..580708edfe39 100755 --- a/llvm/utils/release/build_llvm_package.bat +++ b/llvm/utils/release/build_llvm_package.bat @@ -52,7 +52,17 @@ svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lldb/%branch% llvm REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226. -set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DCMAKE_INSTALL_UCRT_LIBRARIES=ON -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: " +set cmake_flags=^ + -DCMAKE_BUILD_TYPE=Release ^ + -DLLVM_ENABLE_ASSERTIONS=ON ^ + -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON ^ + -DLLVM_BUILD_LLVM_C_DYLIB=ON ^ + -DCMAKE_INSTALL_UCRT_LIBRARIES=ON ^ + -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% ^ + -DPACKAGE_VERSION=%package_version% ^ + -DLLDB_RELOCATABLE_PYTHON=1 ^ + -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe ^ + -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: " REM TODO: Run the "check-all" tests.