Detect arch in set_paths.sh.

diff --git a/platform/osx/set_paths.sh b/platform/osx/set_paths.sh
index 65fcdedf37f8a3cc60d314390fffcb702d99ce18..07890394cd50db25c0e6f435e1aa4c54ddcad085 100644 (file)
--- 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