llvm.org GIT mirror llvm / bfb9843
Update build_llvm_package.bat I moved to a new machine and had to adjust a few things: - Use %USERNAME% instead of %USER% (not sure why %USER% didn't work anymore) - Update paths for using Python 3.6 instead of 3.5 - Skip building OpenMP which seems broken on Windows - Work around new vsdevcmd.bat changing paths: https://developercommunity.visualstudio.com/content/problem/26780/vsdevcmdbat-changes-the-current-working-directory.html - Build stage-0 compiler with MinSizeRel to work around VS 2017 bug: https://developercommunity.visualstudio.com/content/problem/139043/miscompile-in-trivial-c-program-with-155-preview-2.html git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@323427 91177308-0d34-0410-b5e6-96231b3b80d8 Hans Wennborg 2 years ago
1 changed file(s) with 9 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all
2020 REM You need to modify the paths below:
2121 set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\Tools\VsDevCmd.bat
2222
23 set python32_dir=C:\Users\%USER%\AppData\Local\Programs\Python\Python35-32
24 set python64_dir=C:\Users\%USER%\AppData\Local\Programs\Python\Python35
23 set python32_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36-32
24 set python64_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python36
2525
2626 set revision=%1
2727 set branch=trunk
4646 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/clang-tools-extra/%branch% llvm/tools/clang/tools/extra || exit /b
4747 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lld/%branch% llvm/tools/lld || exit /b
4848 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/compiler-rt/%branch% llvm/projects/compiler-rt || exit /b
49 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/openmp/%branch% llvm/projects/openmp || exit /b
49 REM svn.exe export -r %revision% http://llvm.org/svn/llvm-project/openmp/%branch% llvm/projects/openmp || exit /b
5050 svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lldb/%branch% llvm/tools/lldb || exit /b
5151
5252
5555
5656 REM TODO: Run all tests, including lld and compiler-rt.
5757
58 set "VSCMD_START_DIR=%CD%"
5859 call "%vsdevcmd%" -arch=x86
5960 set CC=
6061 set CXX=
6162 mkdir build32_stage0
6263 cd build32_stage0
63 cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% ..\llvm || exit /b
64 REM Work around VS2017 bug by using MinSizeRel.
65 cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DCMAKE_BUILD_TYPE=MinSizeRel ..\llvm || exit /b
6466 ninja all || exit /b
6567 ninja check || ninja check || ninja check || exit /b
6668 ninja check-clang || ninja check-clang || ninja check-clang || exit /b
8890 cd ..
8991
9092
93 set "VSCMD_START_DIR=%CD%"
9194 call "%vsdevcmd%" -arch=amd64
9295 set CC=
9396 set CXX=
9497 mkdir build64_stage0
9598 cd build64_stage0
96 cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% ..\llvm || exit /b
99 REM Work around VS2017 bug by using MinSizeRel.
100 cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DCMAKE_BUILD_TYPE=MinSizeRel ..\llvm || exit /b
97101 ninja all || exit /b
98102 ninja check || ninja check || ninja check || exit /b
99103 ninja check-clang || ninja check-clang || ninja check-clang || exit /b