summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjeremiah sypult <jeremiah@sypult.com>2013-07-18 01:28:08 -0500
committerTim Angus <tim@ngus.net>2014-06-17 17:43:33 +0100
commitd5108d45fb4b278039f324e1cf4220b9e3c2ba12 (patch)
tree1ba5906cd05658cb688f40cd3210768e00346a99
parentbda6c2a889e2c16846c26c43b3963ba03e1f85b7 (diff)
make-macosx-app.sh doesn't trust the output of 'which', so check for a hard-coded path
-rwxr-xr-xmake-macosx-app.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/make-macosx-app.sh b/make-macosx-app.sh
index 2a63b38c..f4b03b10 100755
--- a/make-macosx-app.sh
+++ b/make-macosx-app.sh
@@ -306,14 +306,11 @@ BUNDLEDIR="${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}"
# simply copying here might stomp on other architectures....
function action()
{
- HAS_LIPO=`which lipo`
- HAS_LIBTOOL=`which libtool`
-
#echo "action ${1} ${2}"
- if [ HAS_LIPO != "" ]; then
+ if [ -x "/usr/bin/lipo" ]; then
lipo -create -o "${1}" "${2}"
- #elif [ HAS_LIBTOOL != "" ]; then
+ #elif [ "/usr/bin/libtool" ]; then
#libtool -dynamic -o ${1} ${2}
else
cp "${2}" "${1}"