Skip to content

Commit 745523f

Browse files
committed
MacOS: define CC, CXX etc. in Conan profile
1 parent 803de99 commit 745523f

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ jobs:
168168
with:
169169
script: |
170170
if ('${{ runner.arch }}' == 'X64') {
171-
target = '10.15';
171+
target = '13.0';
172172
arch='x86_64';
173173
}
174174
else {
175-
target = '12.0';
175+
target = '14.2';
176176
arch='armv8';
177177
}
178178
core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
@@ -196,6 +196,9 @@ jobs:
196196
shell: bash
197197
run: |
198198
brew install ispc
199+
brew install llvm
200+
brew install libomp
201+
export PATH=$(brew --prefix llvm)/bin:$PATH
199202
bash ${{ env.WORKSPACE }}/install-conan.sh
200203
201204
- name: Build (Linux)

conan-profiles/conan-profile-macOS-ARM64

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ minizip-ng/*:with_libcomp=False
1919
[buildenv]
2020
CXX=clang++
2121
CC=clang
22+
AR=llvm-ar
23+
RANLIB=llvm-ranlib
24+
LD=ld.lld
2225

2326
[conf]
2427
&:tools.build:cxxflags=["-O3"]

conan-profiles/conan-profile-macOS-X64

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ include(conan-profile-common)
22

33
[settings]
44
os=Macos
5-
os.version=10.15
5+
# 13.0 is required by libomp
6+
os.version=13.0
67
arch=x86_64
78
compiler=apple-clang
89
compiler.version=14.0
@@ -23,6 +24,9 @@ opensubdiv/*:with_metal=False
2324
[buildenv]
2425
CXX=clang++
2526
CC=clang
27+
AR=llvm-ar
28+
RANLIB=llvm-ranlib
29+
LD=ld.lld
2630

2731
[conf]
2832
&:tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3", "-mno-avx2"]

0 commit comments

Comments
 (0)