Skip to content

Commit 9ce0f85

Browse files
committed
[github, cmake] Remove macOS workflow workarounds that are no longer
necessary. Set CMake policy for Python-lookup behavior to work with latest GitHub macOS runner.
1 parent 00e7934 commit 9ce0f85

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

.github/workflows/llvm-project-tests.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ concurrency:
2525
group: llvm-project-${{ github.workflow }}-${{ inputs.projects}}${{ github.ref }}
2626
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
2727

28-
env:
29-
# Workaround for https://github.com/actions/virtual-environments/issues/5900.
30-
# This should be a no-op for non-mac OSes
31-
CPLUS_INCLUDE_PATH: /usr/local/Cellar/llvm@15/15.0.7/include/c++/v1:/usr/local/Cellar/llvm/15.0.7_1/include/c++/v1:/Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/include
32-
3328
jobs:
3429
lit-tests:
3530
name: Lit Tests
@@ -51,11 +46,6 @@ jobs:
5146
uses: llvm/actions/setup-windows@main
5247
with:
5348
arch: amd64
54-
- name: Check macOS (for debugging)
55-
if: startsWith(matrix.os, 'macos')
56-
run: |
57-
ls /Library/Developer/CommandLineTools/SDKs
58-
find /usr/local -name "cmath*"
5949
# On Windows, starting with win19/20220814.1, cmake choose the 32-bit
6050
# python3.10.6 libraries instead of the 64-bit libraries when building
6151
# lldb. Using this setup-python action to make 3.10 the default

cmake/Modules/CMakePolicy.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CMake policy settings shared between LLVM projects
22

3+
# CMP0094: Use LOCATION for Find_Python lookup strategy.
4+
# New in CMake 3.15: https://cmake.org/cmake/help/latest/policy/CMP0094.html
5+
if(POLICY CMP0094)
6+
cmake_policy(SET CMP0094 NEW)
7+
endif()
38
# CMP0114: ExternalProject step targets fully adopt their steps.
49
# New in CMake 3.19: https://cmake.org/cmake/help/latest/policy/CMP0114.html
510
if(POLICY CMP0114)

0 commit comments

Comments
 (0)