Skip to content

Commit 4db865c

Browse files
committed
Revert "MacOS: define CC, CXX etc. in Conan profile"
This reverts commit cfd4d80.
1 parent cfd4d80 commit 4db865c

File tree

3 files changed

+11
-37
lines changed

3 files changed

+11
-37
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 16 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 = '13.0';
171+
target = '10.15';
172172
arch='x86_64';
173173
}
174174
else {
175-
target = '14.2';
175+
target = '12.0';
176176
arch='armv8';
177177
}
178178
core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
@@ -196,16 +196,7 @@ jobs:
196196
shell: bash
197197
run: |
198198
brew install ispc
199-
brew install llvm
200-
brew install libomp
201-
202-
T=$(brew --prefix llvm)
203-
ln -s $T/bin/llvm-install-name-tool $T/bin/install_name_tool
204-
205-
PATH=$T/bin:$PATH
206-
export PATH
207-
208-
source ${{ env.WORKSPACE }}/install-conan.sh
199+
bash ${{ env.WORKSPACE }}/install-conan.sh
209200
210201
- name: Build (Linux)
211202
if: runner.os == 'Linux'
@@ -406,10 +397,10 @@ jobs:
406397
path: conan-cache
407398
key: deps-${{ matrix.os }}-${{ github.run_id }}
408399

409-
# For debugging
410-
- name: Setup tmate session (debug)
411-
if: ${{ failure() }}
412-
uses: mxschmitt/action-tmate@v3
400+
## For debugging
401+
#- name: Setup tmate session (debug)
402+
#if: ${{ failure() }}
403+
#uses: mxschmitt/action-tmate@v3
413404

414405
# Upload artifacts
415406
- uses: actions/upload-artifact@v4

conan-profiles/conan-profile-macOS-ARM64

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ 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
2522

2623
[conf]
2724
&:tools.build:cxxflags=["-O3"]

conan-profiles/conan-profile-macOS-X64

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ include(conan-profile-common)
22

33
[settings]
44
os=Macos
5-
# 13.0 is required by libomp
6-
os.version=13.0
5+
os.version=10.15
76
arch=x86_64
87
compiler=apple-clang
9-
compiler.version=15
8+
compiler.version=14.0
109
compiler.cppstd={{ os.getenv("CXX_VERSION") }}
1110
compiler.libcxx=libc++
1211

@@ -22,22 +21,9 @@ openvdb/*:simd=AVX
2221
opensubdiv/*:with_metal=False
2322

2423
[buildenv]
25-
# https://www.gnu.org/software/make/manual/make.html#index-AR
26-
CXX=/usr/local/opt/llvm/bin/clang++
27-
CC=/usr/local/opt/llvm/bin/clang
28-
AR=/usr/local/opt/llvm/bin/llvm-ar
29-
RANLIB=/usr/local/opt/llvm/bin/llvm-ranlib
30-
LD=/usr/local/opt/llvm/bin/ld.lld
31-
OBJCOPY=/usr/local/opt/llvm/bin/llvm-objcopy
32-
OBJDUMP=/usr/local/opt/llvm/bin/llvm-objdump
33-
OTOOL=/usr/local/opt/llvm/bin/llvm-otool
34-
NM=/usr/local/opt/llvm/bin/llvm-nm
35-
LIBTOOL=/usr/local/opt/llvm/bin/llvm-libtool-darwin
36-
LIPO=/usr/local/opt/llvm/bin/llvm-lipo
37-
STRIP=/usr/local/opt/llvm/bin/llvm-strip
38-
24+
CXX=clang++
25+
CC=clang
3926

4027
[conf]
4128
&:tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3", "-mno-avx2"]
42-
&:tools.build:verbosity=verbose
4329
# NB: Github MacOS X64 runner does not support avx2 nor avx512

0 commit comments

Comments
 (0)