lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Retain symlinks upon making universal macos binaries"

Browse Source 
This reverts commit a3c489b272.

Reason for revert: Mistakenly replaced 'set -e' => 'set -x' just hides the problem on macOS 11 and 12. The patch needs to be investigated again

Pick-to: 6.7
Change-Id: I238395fd2ae1fc362a0c9af02e2d48acce22e0dc
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
This commit is contained in:
Artem Dyomin
2023-12-27 18:46:37 +00:00
parent 134b5f3ef6
commit f87f27dc62
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coin/provisioning/common/macos/makeuniversal.sh
View File

@@ -4,22 +4,16 @@
# Copies or lipos files from the given DESTDIR dirs to the respective install dir # Copies or lipos files from the given DESTDIR dirs to the respective install dir
set -x set -e
for dir in "$@"; do for dir in "$@"; do
echo "Processing files in $dir ..." echo "Processing files in $dir ..."
pushd "$dir" >/dev/null pushd "$dir" >/dev/null
find . -type f -or -type l | while read -r f; do find . -type f | while read -r f; do
dst="${f:1}" dst="${f:1}"
dstdir="$(dirname "$dst")" dstdir="$(dirname "$dst")"
mkdir -p "$dstdir" mkdir -p "$dstdir"
if [[ ! -f "$dst" ]]; then
if [[ -L "$f" ]]; then
if [[ ! -L "$dst" ]]; then
echo "Copying symlink $dir/$f to $dst"
cp -P -n "$f" "$dst"
fi
elif [[ ! -f "$dst" ]]; then
echo "Copying $dir/$f to $dst" echo "Copying $dir/$f to $dst"
cp -c "$f" "$dst" cp -c "$f" "$dst"
elif lipo -info "$f" >/dev/null 2>&1; then elif lipo -info "$f" >/dev/null 2>&1; then