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

[Hans Wennborg via llvm-commits]

Author: hans
Date: Wed Jan 16 04:36:28 2019
New Revision: 351329

URL: http://llvm.org/viewvc/llvm-project?rev=351329&view=rev
Log:
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

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/utils/release/build_llvm_package.bat

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=351329&r1=351328&r2=351329&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Jan 16 04:36:28 2019
@@ -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()

Modified: llvm/trunk/utils/release/build_llvm_package.bat
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/release/build_llvm_package.bat?rev=351329&r1=351328&r2=351329&view=diff
==============================================================================
--- llvm/trunk/utils/release/build_llvm_package.bat (original)
+++ llvm/trunk/utils/release/build_llvm_package.bat Wed Jan 16 04:36:28 2019
@@ -52,17 +52,7 @@ svn.exe export -r %revision% http://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 ^
-	-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: "
+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: "
 
 REM TODO: Run all tests, including lld and compiler-rt.