Skip to content

Commit ada0dd4

Browse files
Fix over stripping
1 parent 1fc8aad commit ada0dd4

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ifeq ($(shell uname),Linux)
2323
else
2424
mkdir -p $@ && cd $@ && \
2525
curl -L $(SWIFT_LINUX_TOOLCHAIN_DOWNLOAD_URL) | tar xz --strip-components 1
26-
./utils/remove-swift-extra-files.sh
26+
./utils/remove-swift-extra-files.sh ./prebuilt/linux/swift
2727
endif
2828
prebuilt/libatomic.so.1:
2929
./utils/download-libatomic.sh $(LIBATOMIC_DOWNLOAD_URL)

utils/remove-swift-extra-files.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
source="$(cd "$(dirname $0)/.." && pwd)"
3-
basepath="$source/prebuilt/linux/swift/usr"
3+
basepath="$1"
44
filestoremove="bin/sil-*
55
bin/lldb*
66
bin/*lld*
@@ -11,6 +11,7 @@ bin/clang-10
1111
bin/clang-cl
1212
bin/sourcekitd-*
1313
bin/swift-build
14+
bin/swift-package
1415
bin/swift-run
1516
bin/swift-test
1617
bin/swift-api-digester
@@ -27,9 +28,17 @@ bin/swift-symbolgraph-extract
2728
bin/swift-*-test
2829
bin/llvm*
2930
bin/llc
31+
bin/objdump
32+
bin/strip
33+
bin/objcopy
34+
bin/nm
35+
bin/size
3036
lib/libsourcekitdInProc.so
3137
lib/swift_static/linux/*
32-
lib/swift"
38+
lib/swift/clang/lib
39+
lib/swift/pm
40+
lib/swift/FrameworkABIBaseline
41+
lib/swift/linux"
3342
for i in $filestoremove
3443
do
3544
echo $basepath/$i

0 commit comments

Comments
 (0)