mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Revert "Retain symlinks upon making universal macos binaries"
This reverts commita3c489b272. 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 Change-Id: I238395fd2ae1fc362a0c9af02e2d48acce22e0dc Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commitf87f27dc62) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
a82fde1e9f
commit
fbae0d81d6
@@ -4,22 +4,16 @@
|
||||
|
||||
# Copies or lipos files from the given DESTDIR dirs to the respective install dir
|
||||
|
||||
set -x
|
||||
set -e
|
||||
|
||||
for dir in "$@"; do
|
||||
echo "Processing files in $dir ..."
|
||||
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}"
|
||||
dstdir="$(dirname "$dst")"
|
||||
mkdir -p "$dstdir"
|
||||
|
||||
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
|
||||
if [[ ! -f "$dst" ]]; then
|
||||
echo "Copying $dir/$f to $dst"
|
||||
cp -c "$f" "$dst"
|
||||
elif lipo -info "$f" >/dev/null 2>&1; then
|
||||
|
||||
Reference in New Issue
Block a user