blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 03:50:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

brew --prefix llvm@18 has different paths for x64 and arm64

Browse source
This commit is contained in:
Dan Paulat 2025-06-17 19:30:47 -05:00
parent 48c5dd4fc4
commit 69d9137faf
3 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
CMakePresets.json
View file

@ -227,14 +227,7 @@
{ {
"name": "macos-clang18-base", "name": "macos-clang18-base",
"inherits": "macos-base", "inherits": "macos-base",
"hidden": true, "hidden": true
"environment": {
"CC": "/opt/homebrew/opt/llvm@18/bin/clang",
"CXX": "/opt/homebrew/opt/llvm@18/bin/clang++",
"PATH": "/opt/homebrew/opt/llvm@18/bin:$penv{PATH}",
"CPPFLAGS": "-I/opt/homebrew/opt/llvm@18/include",
"LDFLAGS": "-L/opt/homebrew/opt/llvm@18/lib -L/opt/homebrew/opt/llvm@18/lib/c++"
}
}, },
{ {
"name": "macos-clang18-x64-base", "name": "macos-clang18-x64-base",
@ -243,6 +236,13 @@
"cacheVariables": { "cacheVariables": {
"CONAN_HOST_PROFILE": "scwx-macos_clang-18", "CONAN_HOST_PROFILE": "scwx-macos_clang-18",
"CONAN_BUILD_PROFILE": "scwx-macos_clang-18" "CONAN_BUILD_PROFILE": "scwx-macos_clang-18"
},
"environment": {
"CC": "/usr/local/opt/llvm@18/bin/clang",
"CXX": "/usr/local/opt/llvm@18/bin/clang++",
"PATH": "/usr/local/opt/llvm@18/bin:$penv{PATH}",
"CPPFLAGS": "-I/usr/local/opt/llvm@18/include",
"LDFLAGS": "-L/usr/local/opt/llvm@18/lib -L/usr/local/opt/llvm@18/lib/c++"
} }
}, },
{ {
@ -252,6 +252,13 @@
"cacheVariables": { "cacheVariables": {
"CONAN_HOST_PROFILE": "scwx-macos_clang-18_armv8", "CONAN_HOST_PROFILE": "scwx-macos_clang-18_armv8",
"CONAN_BUILD_PROFILE": "scwx-macos_clang-18_armv8" "CONAN_BUILD_PROFILE": "scwx-macos_clang-18_armv8"
},
"environment": {
"CC": "/opt/homebrew/opt/llvm@18/bin/clang",
"CXX": "/opt/homebrew/opt/llvm@18/bin/clang++",
"PATH": "/opt/homebrew/opt/llvm@18/bin:$penv{PATH}",
"CPPFLAGS": "-I/opt/homebrew/opt/llvm@18/include",
"LDFLAGS": "-L/opt/homebrew/opt/llvm@18/lib -L/opt/homebrew/opt/llvm@18/lib/c++"
} }
}, },
{ {

10
tools/setup-macos-debug.sh
View file

@ -11,12 +11,12 @@ export qt_arch=macos
export address_sanitizer=${4:-disabled} export address_sanitizer=${4:-disabled}
# Set explicit compiler paths # Set explicit compiler paths
export CC=/opt/homebrew/opt/llvm@18/bin/clang export CC=$(brew --prefix llvm@18)/bin/clang
export CXX=/opt/homebrew/opt/llvm@18/bin/clang++ export CXX=$(brew --prefix llvm@18)/bin/clang++
export PATH="/opt/homebrew/opt/llvm@18/bin:$PATH" export PATH="$(brew --prefix llvm@18)/bin:$PATH"
export LDFLAGS="-L/opt/homebrew/opt/llvm@18/lib -L/opt/homebrew/opt/llvm@18/lib/c++" export LDFLAGS="-L$(brew --prefix llvm@18)/lib -L$(brew --prefix llvm@18)/lib/c++"
export CPPFLAGS="-I/opt/homebrew/opt/llvm@18/include" export CPPFLAGS="-I$(brew --prefix llvm@18)/include"
# Assign user-specified Python Virtual Environment # Assign user-specified Python Virtual Environment
if [ "${3:-}" = "none" ]; then if [ "${3:-}" = "none" ]; then

10
tools/setup-macos-release.sh
View file

@ -11,12 +11,12 @@ export qt_arch=macos
export address_sanitizer=${4:-disabled} export address_sanitizer=${4:-disabled}
# Set explicit compiler paths # Set explicit compiler paths
export CC=/opt/homebrew/opt/llvm@18/bin/clang export CC=$(brew --prefix llvm@18)/bin/clang
export CXX=/opt/homebrew/opt/llvm@18/bin/clang++ export CXX=$(brew --prefix llvm@18)/bin/clang++
export PATH="/opt/homebrew/opt/llvm@18/bin:$PATH" export PATH="$(brew --prefix llvm@18)/bin:$PATH"
export LDFLAGS="-L/opt/homebrew/opt/llvm@18/lib -L/opt/homebrew/opt/llvm@18/lib/c++" export LDFLAGS="-L$(brew --prefix llvm@18)/lib -L$(brew --prefix llvm@18)/lib/c++"
export CPPFLAGS="-I/opt/homebrew/opt/llvm@18/include" export CPPFLAGS="-I$(brew --prefix llvm@18)/include"
# Assign user-specified Python Virtual Environment # Assign user-specified Python Virtual Environment
if [ "${3:-}" = "none" ]; then if [ "${3:-}" = "none" ]; then