From 437667a37951ee4c5146a5755f70d434fe98d039 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 4 Feb 2024 12:33:36 +0100 Subject: [PATCH] Detect arch in set_paths.sh. --- platform/osx/set_paths.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh index 65fcdedf3..07890394c 100644 --- a/platform/osx/set_paths.sh +++ b/platform/osx/set_paths.sh @@ -1,15 +1,16 @@ base=$HOME/workspace -if [[ "$(uname -m)" == arm64 ]]; then +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 CPPFLAGS= LDFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch $arch" +export LINKFLAGS="-L$base/lib -L$env/lib -isysroot $sdk/MacOSX11.0.sdk -arch $arch" 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 CXXFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch $arch" +export CFLAGS="-I$base/include -I$env/include -isysroot $sdk/MacOSX11.0.sdk -arch $arch" export PATH=$env/bin:$PATH export PKG_CONFIG_PATH=$env/lib/pkgconfig:$base/lib/pkgconfig -- 2.30.2