Revert r351324 "Build LLVM-C.dll by default on windows and enable in release package"

This broke the build, ending up with too long command-lines when invoking gen-mscv-exports.py.

> As it says in the subject, should have gone long enough now that this
> should be safe. 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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@351329 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a24c5c..168ec6a 100644 (file)
--- a/CMakeLists.txt
+++ b/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)" ON)
+  option(LLVM_BUILD_LLVM_C_DYLIB "Build LLVM-C.dll (Windows only)" OFF)
 else()
   option(LLVM_BUILD_LLVM_C_DYLIB "Build libllvm-c re-export library (Darwin only)" OFF)
 endif()

diff --git a/utils/release/build_llvm_package.bat b/utils/release/build_llvm_package.bat
index dc2aab7..ae406c8 100755 (executable)
--- a/utils/release/build_llvm_package.bat
+++ b/utils/release/build_llvm_package.bat
@@ -52,17 +52,7 @@ svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lldb/%branch% llvm
 \r
 \r
 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.\r
-set cmake_flags=^\r
-       -DCMAKE_BUILD_TYPE=Release ^\r
-       -DLLVM_ENABLE_ASSERTIONS=ON ^\r
-       -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON ^\r
-       -DLLVM_BUILD_LLVM_C_DYLIB=ON ^\r
-       -DCMAKE_INSTALL_UCRT_LIBRARIES=ON ^\r
-       -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% ^\r
-       -DPACKAGE_VERSION=%package_version% ^\r
-       -DLLDB_RELOCATABLE_PYTHON=1 ^\r
-       -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe ^\r
-       -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "\r
+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: "\r
 \r
 REM TODO: Run all tests, including lld and compiler-rt.\r
 \r