From 8e5271e578fd5675620d85f8bf302baad6222e3b Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Fri, 3 Apr 2020 10:41:23 +0300 Subject: [PATCH] Fix handling symbolic links to '../*' in update_xcode.sh tar -s pattern was mistakenly applied to symlink targets too, turning symlink target '../foo' into 'bar./foo'. --- tools/scripts/update_xcode.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/scripts/update_xcode.sh b/tools/scripts/update_xcode.sh index 5300e6e4346..1ba331de329 100755 --- a/tools/scripts/update_xcode.sh +++ b/tools/scripts/update_xcode.sh @@ -21,7 +21,7 @@ for s in $SDKS; do tarball_var=TARBALL_${s} tarball=${!tarball_var} echo "Packing SDK $s as $OUT/$tarball.tar.gz..." - $SHELL -c "tar czf $OUT/$tarball.tar.gz -C $p -s '/^\./$tarball/' ." + $SHELL -c "tar czf $OUT/$tarball.tar.gz -C $p -s '/^\./$tarball/HS' ." done t=`xcrun -f ld` @@ -29,11 +29,11 @@ t=`dirname $t` t=`grealpath $t/../..` tarball=$TARBALL_xcode echo "Packing toolchain $OUT/$tarball.tar.gz..." -$SHELL -c "tar czf $OUT/$tarball.tar.gz -C $t -s '/^\./$tarball/' ." +$SHELL -c "tar czf $OUT/$tarball.tar.gz -C $t -s '/^\./$tarball/HS' ." t=`xcrun -f bitcode-build-tool` t=`dirname $t` t=`grealpath $t/..` tarball=$TARBALL_xcode_addon echo "Packing additional tools $OUT/$tarball.tar.gz..." -$SHELL -c "tar czf $OUT/$tarball.tar.gz -C $t -s '/^\./$tarball/' ." +$SHELL -c "tar czf $OUT/$tarball.tar.gz -C $t -s '/^\./$tarball/HS' ."