summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-02-04 13:03:45 +0100
committerCarl Hetherington <cth@carlh.net>2024-02-04 13:03:45 +0100
commit2310a084216fc737fad879b79ae9f845ac461c1b (patch)
tree30a84fb627877a9f87046063062a636cd95d5af5 /platform
parent52dc2f13d5cd03403da20e1764ba474c829a1a26 (diff)
parent32dcd32b2c87766a1248bb078826ce9b83efacc4 (diff)
Merge branch 'main' into v2.17.x
Diffstat (limited to 'platform')
-rw-r--r--platform/osx/set_paths.sh26
1 files changed, 19 insertions, 7 deletions
diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh
index 91d67ba94..24baa6cd6 100644
--- a/platform/osx/set_paths.sh
+++ b/platform/osx/set_paths.sh
@@ -1,11 +1,23 @@
-base=$HOME/workspace
-env=$HOME/osx-environment/x86_64/10.10
+SDK=$1
+if [[ "$SDK" == 11 ]]; then
+ isysroot="-isysroot $HOME/SDK/MacOS11.0.sdk"
+ base=$HOME/workspace
+ export MACOSX_DEPLOYMENT_TARGET=10.10
+else
+ base=/usr/local
+fi
+
+arch=$(uname -m)
+if [[ "$arch" == arm64 ]]; then
+ env=$HOME/osx-environment/arm64/11.0
+else
+ env=$HOME/osx-environment/x86_64/10.10
+fi
sdk=$HOME/SDK
-export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export LINKFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export MACOSX_DEPLOYMENT_TARGET=10.10
-export CXXFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
-export CFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch x86_64"
+export CPPFLAGS= LDFLAGS="-L$base/lib -L$env/lib $isysroot -arch $arch"
+export LINKFLAGS="-L$base/lib -L$env/lib $isysroot -arch $arch"
+export CXXFLAGS="-I$base/include -I$env/include $isysroot -arch $arch"
+export CFLAGS="-I$base/include -I$env/include $isysroot -arch $arch"
export PATH=$env/bin:$PATH
export PKG_CONFIG_PATH=$env/lib/pkgconfig:$base/lib/pkgconfig