This is an archive of the discontinued LLVM Phabricator instance.

Differential D130067

Windows packaging script. Include lld-link, llvm-lib and llvm-windres from stage0.
ClosedPublic

Authored by CarlosAlbertoEnciso on Jul 19 2022, 2:02 AM.

Details

Reviewers
hans
thieta
russell.gallop
Commits
rGc96ddd7019b0: Update the Windows packaging script.
Summary

As discussed on:

https://discourse.llvm.org/t/build-llvm-release-bat-script-options/63146/6
  • In stage1 use the following binaries from stage0: lld-link, llvm-lib and llvm-windres

Diff Detail

Event Timeline

CarlosAlbertoEnciso created this revision.Jul 19 2022, 2:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 19 2022, 2:02 AM
CarlosAlbertoEnciso requested review of this revision.Jul 19 2022, 2:02 AM
Herald added a subscriber: llvm-commits. · View Herald TranscriptJul 19 2022, 2:02 AM
Harbormaster completed remote builds in B176192: Diff 445736.Jul 19 2022, 3:09 AM
hans accepted this revision.Jul 19 2022, 6:58 AM

lgtm

llvm/utils/release/build_llvm_release.bat
164

nit: it seems inconsistent that clang-cl and lld-link have ".exe" but llvm-lib and llvm-windres don't

This revision is now accepted and ready to land.Jul 19 2022, 6:58 AM
This revision was landed with ongoing or failed builds.Jul 19 2022, 11:16 PM
Closed by commit rGc96ddd7019b0: Update the Windows packaging script. (authored by CarlosAlbertoEnciso). · Explain Why
This revision was automatically updated to reflect the committed changes.
CarlosAlbertoEnciso added a commit: rGc96ddd7019b0: Update the Windows packaging script..
CarlosAlbertoEnciso added a comment.Jul 19 2022, 11:18 PM

@hans Thanks.

llvm/utils/release/build_llvm_release.bat
164

Added the .exe extension.

Revision Contents

PathSize
llvm/
utils/
release/
10 lines

Diff 446052

llvm/utils/release/build_llvm_release.bat

Show First 20 Lines • Show All 154 Lines • ▼ Show 20 Lines
REM ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1 REM ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b 1
cd.. cd..
REM CMake expects the paths that specifies the compiler and linker to be REM CMake expects the paths that specifies the compiler and linker to be
REM with forward slash. REM with forward slash.
set all_cmake_flags=^ set all_cmake_flags=^
%cmake_flags% ^ %cmake_flags% ^
-DCMAKE_C_COMPILER=%stage0_bin_dir%/clang-cl.exe ^ -DCMAKE_C_COMPILER=%stage0_bin_dir%/clang-cl.exe ^
-DCMAKE_CXX_COMPILER=%stage0_bin_dir%/clang-cl.exe -DCMAKE_CXX_COMPILER=%stage0_bin_dir%/clang-cl.exe ^
-DCMAKE_LINKER=%stage0_bin_dir%/lld-link.exe ^
hansUnsubmitted
Not Done
ReplyInline Actions

nit: it seems inconsistent that clang-cl and lld-link have ".exe" but llvm-lib and llvm-windres don't

hans: nit: it seems inconsistent that clang-cl and lld-link have ".exe" but llvm-lib and llvm-windres…
CarlosAlbertoEncisoAuthorUnsubmitted
Done
ReplyInline Actions

Added the .exe extension.

CarlosAlbertoEnciso: Added the `.exe` extension.
-DCMAKE_AR=%stage0_bin_dir%/llvm-lib.exe ^
-DCMAKE_RC=%stage0_bin_dir%/llvm-windres.exe
set cmake_flags=%all_cmake_flags:\=/% set cmake_flags=%all_cmake_flags:\=/%
mkdir build32 mkdir build32
cd build32 cd build32
cmake -GNinja %cmake_flags% ..\llvm-project\llvm || exit /b 1 cmake -GNinja %cmake_flags% ..\llvm-project\llvm || exit /b 1
ninja || ninja || ninja || exit /b 1 ninja || ninja || ninja || exit /b 1
REM ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1 REM ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1
REM ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1 REM ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b 1 ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b 1
cd.. cd..
REM CMake expects the paths that specifies the compiler and linker to be REM CMake expects the paths that specifies the compiler and linker to be
REM with forward slash. REM with forward slash.
set all_cmake_flags=^ set all_cmake_flags=^
%cmake_flags% ^ %cmake_flags% ^
-DCMAKE_C_COMPILER=%stage0_bin_dir%/clang-cl.exe ^ -DCMAKE_C_COMPILER=%stage0_bin_dir%/clang-cl.exe ^
-DCMAKE_CXX_COMPILER=%stage0_bin_dir%/clang-cl.exe -DCMAKE_CXX_COMPILER=%stage0_bin_dir%/clang-cl.exe ^
-DCMAKE_LINKER=%stage0_bin_dir%/lld-link.exe ^
-DCMAKE_AR=%stage0_bin_dir%/llvm-lib.exe ^
-DCMAKE_RC=%stage0_bin_dir%/llvm-windres.exe
set cmake_flags=%all_cmake_flags:\=/% set cmake_flags=%all_cmake_flags:\=/%
mkdir build64 mkdir build64
cd build64 cd build64
cmake -GNinja %cmake_flags% ..\llvm-project\llvm || exit /b 1 cmake -GNinja %cmake_flags% ..\llvm-project\llvm || exit /b 1
ninja || ninja || ninja || exit /b 1 ninja || ninja || ninja || exit /b 1
ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1 ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b 1
ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1 ninja check-clang || ninja check-clang || ninja check-clang || exit /b 1
Show All 9 Lines