1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Ensure proper quoting when calling otool in objc_namespace script

Browse Source 
Pick-to: 6.2 6.3 5.15
Change-Id: I0c7fc40d321277103f6e80f221884cd87df6f930
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Tor Arne Vestbø 2022-05-20 15:49:41 +02:00
parent 468b33d8f8
commit ebd4f7bcce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/data/mac/objc_namespace.sh
View File

@ -79,7 +79,7 @@ read_32bit_value() {
otool_args= otool_args=
otool() { otool() {
command otool $otool_args $* command otool $otool_args "$@"
} }
declare -a extra_classnames_files declare -a extra_classnames_files
@ -197,13 +197,13 @@ if [ "${mach_header[0]}" != "MH_MAGIC_64" ]; then
exit 1 exit 1
fi fi
architectures=$(otool -f -v $target | grep architecture) architectures=$(otool -f -v "$target" | grep architecture)
setup_arch() { setup_arch() {
arch="$1" arch="$1"
if [ ! -z "$arch" ]; then if [ ! -z "$arch" ]; then
otool_args="-arch $arch" otool_args="-arch $arch"
offset=$(otool -f -v $target | grep -A 6 "architecture $arch" | grep offset) offset=$(otool -f -v "$target" | grep -A 6 "architecture $arch" | grep offset)
offset="${offset##*( )}" offset="${offset##*( )}"
arch_offset="$(echo $offset | cut -d ' ' -f 2)" arch_offset="$(echo $offset | cut -d ' ' -f 2)"
echo "🤖 Processing architecture '$arch' at offset $arch_offset..." echo "🤖 Processing architecture '$arch' at offset $arch_offset..."