Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

[OSX] Move get command exit code from eval string. 

This fixes #4612.

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
This commit is contained in:
Vitalii Koshura 2022-07-12 00:26:44 +02:00
parent f221ff9a08
commit 4f5d6e9fbf
No known key found for this signature in database
GPG Key ID: CE0DB1726070A5A3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mac_build/BuildMacBOINC.sh
View File

@ -2,7 +2,7 @@
# This file is part of BOINC. # This file is part of BOINC.
# http://boinc.berkeley.edu # http://boinc.berkeley.edu
# Copyright (C) 2017 University of California # Copyright (C) 2022 University of California
# #
# BOINC is free software; you can redistribute it and/or modify it # BOINC is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License # under the terms of the GNU Lesser General Public License
@ -35,6 +35,7 @@
# Updated 10/14/18 for Xcode 10 (use this script only with BOINC 7.15 or later) # Updated 10/14/18 for Xcode 10 (use this script only with BOINC 7.15 or later)
# Updated 3/31/21 To eliminate redundant -c++11 arg since C++11 build is now standard # Updated 3/31/21 To eliminate redundant -c++11 arg since C++11 build is now standard
# Updated 5/19/21 for compatibility with zsh # Updated 5/19/21 for compatibility with zsh
# Updated 7/12/22 result is moved out of eval string to get correct status on CI if build fails
# #
## This script requires OS 10.8 or later ## This script requires OS 10.8 or later
# #
@ -171,8 +172,9 @@ for f in "${settings[@]}"; do
done done
## For unknown reasons, this xcodebuild call generates syntax errors under zsh ## For unknown reasons, this xcodebuild call generates syntax errors under zsh
## unless we enclose the command in quotes and invoke it with eval. ## unless we enclose the command in quotes and invoke it with eval.
eval "xcodebuild -project boinc.xcodeproj ${targets} -configuration ${style} -sdk \"${SDKPATH}\" ${doclean} build ${uselibcplusplus} ${theSettings};result=$?" eval "xcodebuild -project boinc.xcodeproj ${targets} -configuration ${style} -sdk \"${SDKPATH}\" ${doclean} build ${uselibcplusplus} ${theSettings}"
result=$?
if [ $result -eq 0 ]; then if [ $result -eq 0 ]; then
# build ibboinc_zip.a for -all or -lib or default, where # build ibboinc_zip.a for -all or -lib or default, where