diff options
| author | Hans Wennborg <hans@hanshq.net> | 2019-01-29 13:43:22 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2019-01-29 13:43:22 +0000 |
| commit | 81675c8f3bcfe7ceef7ebaa7e9933bf6a095db4c (patch) | |
| tree | d3a95ee505d4f286ff34b6e1c0a9c4acdfdb184e /llvm/utils/release | |
| parent | d442500f5d4e9c999cba611d84f065d9f06e3ada (diff) | |
| download | bcm5719-llvm-81675c8f3bcfe7ceef7ebaa7e9933bf6a095db4c.tar.gz bcm5719-llvm-81675c8f3bcfe7ceef7ebaa7e9933bf6a095db4c.zip | |
Revert r351833 and r352250.
They were breaking the Windows build when using MSBuild, see the
discussion on D56781.
r351833: "Use response file when generating LLVM-C.dll"
> Use response file when generating LLVM-C.dll
>
> As discovered in D56774 the command line gets to long, so use a response file to give the script the libs. This change has been tested and is confirmed working for me.
>
> Commited on behalf of Jakob Bornecrantz
>
> Differential Revision: https://reviews.llvm.org/D56781
r352250: "Build LLVM-C.dll by default on windows and enable in release package"
> 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: 352492
Diffstat (limited to 'llvm/utils/release')
| -rwxr-xr-x | llvm/utils/release/build_llvm_package.bat | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/llvm/utils/release/build_llvm_package.bat b/llvm/utils/release/build_llvm_package.bat index 580708edfe3..8038d798aa0 100755 --- a/llvm/utils/release/build_llvm_package.bat +++ b/llvm/utils/release/build_llvm_package.bat @@ -52,17 +52,7 @@ 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 ^
- -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 the "check-all" tests.
|
