Fix Xcode 10 errors relating to third-party (0.57-stable)

This commit is contained in:
Mike McCartney
2018-11-12 10:26:05 +00:00
committed by Lorenzo Sciandra
parent 08b14f4814
commit 277c19c93e
2 changed files with 116 additions and 60 deletions
+3 -3
View File
@@ -45,7 +45,7 @@ function fetch_and_unpack () {
done
dir=$(basename "$file" .tar.gz)
if [ "$fetched" = "yes" ] || [ ! -d "third-party/$dir" ]; then
if [ "$fetched" = "yes" ] || [ ! -f "third-party/$dir/.installed" ]; then
(cd third-party;
rm -rf "$dir"
echo Unpacking "$cachedir/$file"...
@@ -53,13 +53,13 @@ function fetch_and_unpack () {
file_fail "$cachedir/$file" "Unpacking '$cachedir/$file' failed"
fi
cd "$dir"
eval "${cmd:-true}")
eval "${cmd:-true}" && touch .installed)
fi
}
mkdir -p third-party
SCRIPTDIR=$(dirname "$0")
SCRIPTDIR=$(cd $(dirname "$0") && pwd)
fetch_and_unpack glog-0.3.5.tar.gz https://github.com/google/glog/archive/v0.3.5.tar.gz 61067502c5f9769d111ea1ee3f74e6ddf0a5f9cc "\"$SCRIPTDIR/ios-configure-glog.sh\""
fetch_and_unpack double-conversion-1.1.6.tar.gz https://github.com/google/double-conversion/archive/v1.1.6.tar.gz 1c7d88afde3aaeb97bb652776c627b49e132e8e0