Cleanups last commit was working

Author: tstellar

.github/workflows/release-binaries.yml

@@ -67,19 +67,6 @@ jobs:
       test-runs-on: ${{ steps.vars.outputs.build-runs-on }}
 
     steps:
-    - name: Bash Test
-      shell: bash
-      run: |
-        export PATH=C:\Strawberry\c\bin\:C:\Android\android-sdk\cmake\3.18.1\bin:$PATH
-        export PATH=/c/Strawberry/c/bin/:$PATH
-        cmake --version
-        which cmake
-        /c/Android/android-sdk/cmake/3.31.5/bin/cmake.exe --version
-#    - name: Check long paths
-#      run: |
-#        Get-ChildItem -Path "C:\Strawberry\" -Recurse -Include "cmake.exe"
-#        Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled'
-#        New-Item -Path "C:\actions-runner\llvm-project\llvm-project\build\tools\clang\stage2-instrumented-bins\tools\clang\stage2-bins\tools\mlir\tools\mlir-linalg-ods-gen\CMakeFiles\mlir-linalg-ods-yaml-gen.dir\C_\actions-runner\llvm-project\llvm-project\llvm\resources\windows_version_resource.rc.res" -ItemType File -Force
     # It's good practice to use setup-python, but this is also required on macos-14
     # due to https://github.com/actions/runner-images/issues/10385
     - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
@@ -171,6 +158,11 @@ jobs:
 
         build_flang="true"
 
+        if [ "$RUNNER_OS" = "Windows" ]; then
+          # The build times out on Windows, so we need to disable LTO.
+          target_cmake_flags="$target_cmake_flags -DLLVM_RELEASE_ENABLE_LTO=OFF"
+        fi
+
         echo "target-cmake-flags=$target_cmake_flags" >> $GITHUB_OUTPUT
         echo "build-flang=$build_flang" >> $GITHUB_OUTPUT
         case "${{ inputs.runs-on }}" in
@@ -208,10 +200,7 @@ jobs:
     if: github.repository_owner == 'llvm'
     runs-on: ${{ needs.prepare.outputs.build-runs-on }}
     steps:
-#    - name: Check long paths
-#      run: |
-#        Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled'
-#        New-Item -Path "C:\actions-runner\llvm-project\llvm-project\build\tools\clang\stage2-instrumented-bins\tools\clang\stage2-bins\tools\mlir\tools\mlir-linalg-ods-gen\CMakeFiles\mlir-linalg-ods-yaml-gen.dir\C_\actions-runner\llvm-project\llvm-project\llvm\resources\windows_version_resource.rc.res" -ItemType File -Force
+
     - name: Checkout Actions
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
@@ -263,23 +252,6 @@ jobs:
         cmake -G Ninja -S S:\llvm -B S:\build `
             ${{ needs.prepare.outputs.target-cmake-flags }} `
             -C clang\cmake\caches\Release.cmake `
-            -DBOOTSTRAP_LLVM_PARALLEL_LINK_JOBS=1 `
-            -DCMAKE_OBJECT_PATH_MAX=500 `
-            -DCMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS=1 `
-            -DCMAKE_CXX_USE_RESPONSE_FILE_FOR_LIBRARIES=1 `
-            -DCMAKE_CXX_RESPONSE_FILE_LINK_FLAG="@" `
-            -DCMAKE_NINJA_FORCE_RESPONSE_FILE=1 `
-            -DBOOTSTRAP_CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS=1 `
-            -DBOOTSTRAP_CMAKE_CXX_USE_RESPONSE_FILE_FOR_LIBRARIES=1 `
-            -DBOOTSTRAP_CMAKE_CXX_RESPONSE_FILE_LINK_FLAG="@" `
-            -DBOOTSTRAP_CMAKE_NINJA_FORCE_RESPONSE_FILE=1 `
-            -DBOOTSTRAP_BOOTSTRAP_CMAKE_CXX_USE_RESPONSE_FILE_FOR_OBJECTS=1 `
-            -DBOOTSTRAP_BOOTSTRAP_CMAKE_CXX_USE_RESPONSE_FILE_FOR_LIBRARIES=1 `
-            -DBOOTSTRAP_BOOTSTRAP_CMAKE_CXX_RESPONSE_FILE_LINK_FLAG="@" `
-            -DBOOTSTRAP_BOOTSTRAP_CMAKE_NINJA_FORCE_RESPONSE_FILE=1 `
-            -DBOOTSTRAP_CMAKE_OBJECT_PATH_MAX=500 `
-            -DBOOTSTRAP_BOOTSTRAP_CMAKE_OBJECT_PATH_MAX=500 `
-            -DBOOTSTRAP_BOOTSTRAP_LLVM_BUILD_TOOLS=OFF `
             -DBOOTSTRAP_BOOTSTRAP_CPACK_GENERATOR=WIX `
             -DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"
 
@@ -327,13 +299,6 @@ jobs:
       with:
         build-prefix: ${{ steps.setup-stage.outputs.build-prefix }}
 
-    #  cat S:/build/tools/clang/stage2-instrumented-bins/tools/clang/stage2-bins/_CPack_Packages/win64/NSIS/NSISOutput.log
-    #  cat S:/build/tools/clang/stage2-instrumented-bins/tools/clang/stage2-bins/_CPack_Packages/win64/WIX/wix.log
-    - name: Check Disk
-      if: always()
-      run: |
-        Get-WmiObject -Class Win32_LogicalDisk -ComputerName LOCALHOST | ? {$_. DriveType -eq 3} | select DeviceID, {$_.Size /1GB}, {$_.FreeSpace /1GB}
-
   upload-release-binaries:
     name: "Upload Release Binaries"
     needs:

clang/cmake/caches/Release.cmake

@@ -47,7 +47,7 @@ set (DEFAULT_RUNTIMES "compiler-rt;libcxx")
 if (NOT WIN32)
   list(APPEND DEFAULT_RUNTIMES "libcxxabi" "libunwind")
 endif()
-set(LLVM_RELEASE_ENABLE_LTO OFF CACHE STRING "")
+set(LLVM_RELEASE_ENABLE_LTO THIN CACHE STRING "")
 set(LLVM_RELEASE_ENABLE_PGO ON CACHE BOOL "")
 set(LLVM_RELEASE_ENABLE_RUNTIMES ${DEFAULT_RUNTIMES} CACHE STRING "")
 set(LLVM_RELEASE_ENABLE_PROJECTS ${DEFAULT_PROJECTS} CACHE STRING "")