diff options
author | Eike Ziller <eike.ziller@digia.com> | 2014-04-15 15:30:51 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-04-16 10:24:24 +0200 |
commit | 1b2032b85052dd8a25623e1507e50eeb5cd1b27a (patch) | |
tree | f782f36819da9535cc0d177c7d6df7bb4bccf9c7 /tools | |
parent | 50478a87cf23e85c004a9a20adea04ec508075cd (diff) |
Mac: Do not require Xcode command line tools
/usr/bin/xcrun is the tool to use for running build tools from the
current Xcode installation, without the need to install anything beside
it.
Task-number: QTBUG-38015
Change-Id: I32ba8bfac2f2c49e863fe8aeeecaf3df80afb8c8
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/binarycreator/resources/copylibsintobundle.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/binarycreator/resources/copylibsintobundle.sh b/tools/binarycreator/resources/copylibsintobundle.sh index 3fd562dce..23484ef4a 100644 --- a/tools/binarycreator/resources/copylibsintobundle.sh +++ b/tools/binarycreator/resources/copylibsintobundle.sh @@ -58,7 +58,7 @@ function handleFile() local BUNDLE=$2 # all dynamic libs directly needed by the bundle, which are not in /System/Library or in /usr/lib (which are system default libs, which we don't want) - local LIBS=`otool -L $FILE | grep -v 'executable_path' | grep -v '/System/Library' | grep -v '/usr/lib' | grep '/' | sed -ne 's,^ *\(.*\) (.*,\1,p'` + local LIBS=`xcrun otool -L $FILE | grep -v 'executable_path' | grep -v '/System/Library' | grep -v '/usr/lib' | grep '/' | sed -ne 's,^ *\(.*\) (.*,\1,p'` local lib for lib in $LIBS; do @@ -111,7 +111,7 @@ function handleFile() handleFile "$BUNDLE/Contents/Frameworks/$NEWFRAMEWORKPATH" "$BUNDLE" fi # and inform the dynamic linker about this - install_name_tool -change $lib @executable_path/../Frameworks/$NEWFRAMEWORKPATH $FILE + xcrun install_name_tool -change $lib @executable_path/../Frameworks/$NEWFRAMEWORKPATH $FILE # this part handles 'normal' dynamic libraries (.dylib) @@ -137,7 +137,7 @@ function handleFile() fi # and inform the dynamic linker about this - install_name_tool -change $lib @executable_path/../Frameworks/$NAME $FILE + xcrun install_name_tool -change $lib @executable_path/../Frameworks/$NAME $FILE fi fi @@ -163,13 +163,13 @@ function handleQtPlugins() if echo $plugin | grep 'debug' >/dev/null; then #if [ $IS_DEBUG -eq 1 ]; then cp "$PLUGINPATH/$CLASS/$plugin" $BUNDLE/Contents/plugins/$CLASS - install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE + xcrun install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE handleFile $BUNDLE/Contents/plugins/$CLASS/$plugin $BUNDLE #fi else #if [ $IS_DEBUG -eq 0 ]; then cp "$PLUGINPATH/$CLASS/$plugin" $BUNDLE/Contents/plugins/$CLASS - install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE + xcrun install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE handleFile $BUNDLE/Contents/plugins/$CLASS/$plugin $BUNDLE #fi fi |