diff options
author | Artem Dyomin <artem.dyomin@qt.io> | 2024-01-22 13:48:30 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-14 09:19:46 +0000 |
commit | 0abefd8bba53b4e5a11c6b9db729b355bf8724e3 (patch) | |
tree | 9d9caf2216a12f0bf8fdefeef5becd985e172325 | |
parent | a92bc9040a3448848f06017306fe622f4fb0559c (diff) |
Retain symlinks upon making universal macOS binaries
Saving symlinks is important when we build dynamic libs,
it will be needed for building QtMM + dynamic ffmpeg.
Task-number: QTBUG-120989
Pick-to: 6.6 6.5
Change-Id: I58c040a81f1fa6a3b316ace864fda0687415fd0a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 231d089553e3924bd75e3adf9802bb1c7478c760)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-x | coin/provisioning/common/macos/makeuniversal.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/coin/provisioning/common/macos/makeuniversal.sh b/coin/provisioning/common/macos/makeuniversal.sh index 1baff747..0f5fc6a0 100755 --- a/coin/provisioning/common/macos/makeuniversal.sh +++ b/coin/provisioning/common/macos/makeuniversal.sh @@ -9,11 +9,17 @@ set -e for dir in "$@"; do echo "Processing files in $dir ..." pushd "$dir" >/dev/null - find . -type f | while read -r f; do + find . -type f -or -type l | while read -r f; do dst="${f:1}" dstdir="$(dirname "$dst")" mkdir -p "$dstdir" - if [[ ! -f "$dst" ]]; then + + if [[ -L "$f" ]]; then + if [[ ! -L "$dst" && ! -d "$dst" && ! -f "$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" cp -c "$f" "$dst" elif lipo -info "$f" >/dev/null 2>&1; then |