Skip to content

Commit 664a459

Browse files
committed
Auto merge of #28389 - aidanhs:aphs-update-musl-linking, r=steveklabnik
In addition to instruction updates I - changed from wget to curl, because curl is a prerequisite of rust itself - removed `[...]` because they're missing from so many places it would just obscure the instructions if they were all put in r? @steveklabnik
2 parents 4d6dc7f + 1a6bdba commit 664a459

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

src/doc/trpl/advanced-linking.md

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,33 +80,30 @@ $ mkdir musldist
8080
$ PREFIX=$(pwd)/musldist
8181
$
8282
$ # Build musl
83-
$ wget http://www.musl-libc.org/releases/musl-1.1.10.tar.gz
84-
[...]
83+
$ curl -O http://www.musl-libc.org/releases/musl-1.1.10.tar.gz
8584
$ tar xf musl-1.1.10.tar.gz
8685
$ cd musl-1.1.10/
8786
musl-1.1.10 $ ./configure --disable-shared --prefix=$PREFIX
88-
[...]
8987
musl-1.1.10 $ make
90-
[...]
9188
musl-1.1.10 $ make install
92-
[...]
9389
musl-1.1.10 $ cd ..
9490
$ du -h musldist/lib/libc.a
9591
2.2M musldist/lib/libc.a
9692
$
9793
$ # Build libunwind.a
98-
$ wget http://llvm.org/releases/3.6.1/llvm-3.6.1.src.tar.xz
99-
$ tar xf llvm-3.6.1.src.tar.xz
100-
$ cd llvm-3.6.1.src/projects/
101-
llvm-3.6.1.src/projects $ svn co http://llvm.org/svn/llvm-project/libcxxabi/trunk/ libcxxabi
102-
llvm-3.6.1.src/projects $ svn co http://llvm.org/svn/llvm-project/libunwind/trunk/ libunwind
103-
llvm-3.6.1.src/projects $ sed -i 's#^\(include_directories\).*$#\0\n\1(../libcxxabi/include)#' libunwind/CMakeLists.txt
104-
llvm-3.6.1.src/projects $ mkdir libunwind/build
105-
llvm-3.6.1.src/projects $ cd libunwind/build
106-
llvm-3.6.1.src/projects/libunwind/build $ cmake -DLLVM_PATH=../../.. -DLIBUNWIND_ENABLE_SHARED=0 ..
107-
llvm-3.6.1.src/projects/libunwind/build $ make
108-
llvm-3.6.1.src/projects/libunwind/build $ cp lib/libunwind.a $PREFIX/lib/
109-
llvm-3.6.1.src/projects/libunwind/build $ cd cd ../../../../
94+
$ curl -O http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz
95+
$ tar xf llvm-3.7.0.src.tar.xz
96+
$ cd llvm-3.7.0.src/projects/
97+
llvm-3.7.0.src/projects $ curl http://llvm.org/releases/3.7.0/libcxxabi-3.7.0.src.tar.xz | tar xJf -
98+
llvm-3.7.0.src/projects $ mv libcxxabi-3.7.0.src libcxxabi
99+
llvm-3.7.0.src/projects $ curl http://llvm.org/releases/3.7.0/libunwind-3.7.0.src.tar.xz | tar xJf -
100+
llvm-3.7.0.src/projects $ mv libunwind-3.7.0.src libunwind
101+
llvm-3.7.0.src/projects $ mkdir libunwind/build
102+
llvm-3.7.0.src/projects $ cd libunwind/build
103+
llvm-3.7.0.src/projects/libunwind/build $ cmake -DLLVM_PATH=../../.. -DLIBUNWIND_ENABLE_SHARED=0 ..
104+
llvm-3.7.0.src/projects/libunwind/build $ make
105+
llvm-3.7.0.src/projects/libunwind/build $ cp lib/libunwind.a $PREFIX/lib/
106+
llvm-3.7.0.src/projects/libunwind/build $ cd ../../../../
110107
$ du -h musldist/lib/libunwind.a
111108
164K musldist/lib/libunwind.a
112109
$

0 commit comments

Comments
 (0)