From ea49d5d2daea1d89ed96f9ba5504bc8f32a4428e Mon Sep 17 00:00:00 2001 From: jeremiah sypult Date: Thu, 18 Jul 2013 01:28:08 -0500 Subject: [PATCH] make-macosx-app.sh doesn't trust the output of 'which', so check for a hard-coded path --- make-macosx-app.sh | 7 ++----- 1 file 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}"