diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-09-17 17:57:14 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-09-17 17:57:14 +0200 |
| commit | 866fc8f5137925e684ea855111affe2d71612b88 (patch) | |
| tree | ed2f68bea1d837a1eea9d14c8591ee08212e8aa0 /src/Build | |
| parent | 5c485e80b6165da55932a9d08aa5732146b64db2 (diff) | |
| download | VeraCrypt-866fc8f5137925e684ea855111affe2d71612b88.tar.gz VeraCrypt-866fc8f5137925e684ea855111affe2d71612b88.zip | |
macOS: fix regression in build script that caused it to ignore fuset switch
fixed by Mattoje #1417
Diffstat (limited to 'src/Build')
| -rwxr-xr-x | src/Build/build_veracrypt_macosx.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Build/build_veracrypt_macosx.sh b/src/Build/build_veracrypt_macosx.sh index fa3d02aa..13302442 100755 --- a/src/Build/build_veracrypt_macosx.sh +++ b/src/Build/build_veracrypt_macosx.sh @@ -28,71 +28,71 @@ fuset=false local_build=false # Function to display usage information usage() { echo "Usage: $0 [options]" echo "Options:" echo " -b Use Homebrew to build with precompiled packages" echo " -p Create a package after building" echo " -f Build with FUSE-T support" echo " -l Use local wxWidgets and disable universal binaries" echo " -v <version> Specify wxWidgets version (default: $DEFAULT_WX_VERSION)" echo " -h Display this help message" exit 1 } # Parse command-line options while getopts "bpflv:h" flag do case "${flag}" in b) brew=true;; p) package=true;; f) fuset=true;; l) local_build=true;; v) if [ -z "$OPTARG" ]; then echo "Error: -v requires a version argument." usage fi WX_VERSION=${OPTARG} ;; h) usage;; *) usage;; esac done -export VC_OSX_FUSET=$((fuset ? 1 : 0)) +export VC_OSX_FUSET=$([ "$fuset" = true ] && echo 1 || echo 0) if [ "$fuset" = true ]; then echo "Building VeraCrypt with FUSE-T support" else echo "Building VeraCrypt with MacFUSE support" fi if [ "$brew" = true ]; then if ! command -v brew &> /dev/null; then echo "Homebrew is not installed. Please install Homebrew or run without the -b flag." exit 1 fi export VC_OSX_SDK=$(xcrun --show-sdk-version) # use the latest version installed, this might fail export VC_OSX_TARGET=${VC_OSX_SDK} echo "Using MacOSX SDK $VC_OSX_SDK with target set to $VC_OSX_TARGET" cd "$SOURCEPATH" echo "Building VeraCrypt with precompiled homebrew packages" cellar=$(brew --cellar "wxwidgets") version=$(brew list --versions "wxwidgets" | head -1 | awk '{print $2}') export WX_BUILD_DIR="$cellar/$version/bin" # skip signing and build only for local arch export LOCAL_DEVELOPMENT_BUILD=true # set the correct CPU arch for Makefile export CPU_ARCH=$(uname -m) export AS=$(which yasm) export COMPILE_ASM=$( if [[ "$CPU_ARCH" != "arm64" ]]; then echo true; else echo false; fi ) make clean make if [ "$package" = true ]; then make package fi exit 0 fi |