diff options
| author | bors <bors@rust-lang.org> | 2015-09-14 09:22:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-14 09:22:56 +0000 |
| commit | 664a45976fb5dd433766f73a221435883151d0ee (patch) | |
| tree | 675b551c3788846c079cb1dfd7a2f0de2756969d /src | |
| parent | 4d6dc7f9ba9fe61e38d737b29bfe490e835f6921 (diff) | |
| parent | 1a6bdba05e65e65aad65d6521c301eaec3487882 (diff) | |
| download | rust-664a45976fb5dd433766f73a221435883151d0ee.tar.gz rust-664a45976fb5dd433766f73a221435883151d0ee.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/trpl/advanced-linking.md | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/doc/trpl/advanced-linking.md b/src/doc/trpl/advanced-linking.md index c27f309cf0a..03043f5f737 100644 --- a/src/doc/trpl/advanced-linking.md +++ b/src/doc/trpl/advanced-linking.md @@ -80,33 +80,30 @@ $ mkdir musldist $ PREFIX=$(pwd)/musldist $ $ # Build musl -$ wget http://www.musl-libc.org/releases/musl-1.1.10.tar.gz -[...] +$ curl -O http://www.musl-libc.org/releases/musl-1.1.10.tar.gz $ tar xf musl-1.1.10.tar.gz $ cd musl-1.1.10/ musl-1.1.10 $ ./configure --disable-shared --prefix=$PREFIX -[...] musl-1.1.10 $ make -[...] musl-1.1.10 $ make install -[...] musl-1.1.10 $ cd .. $ du -h musldist/lib/libc.a 2.2M musldist/lib/libc.a $ $ # Build libunwind.a -$ wget http://llvm.org/releases/3.6.1/llvm-3.6.1.src.tar.xz -$ tar xf llvm-3.6.1.src.tar.xz -$ cd llvm-3.6.1.src/projects/ -llvm-3.6.1.src/projects $ svn co http://llvm.org/svn/llvm-project/libcxxabi/trunk/ libcxxabi -llvm-3.6.1.src/projects $ svn co http://llvm.org/svn/llvm-project/libunwind/trunk/ libunwind -llvm-3.6.1.src/projects $ sed -i 's#^\(include_directories\).*$#\0\n\1(../libcxxabi/include)#' libunwind/CMakeLists.txt -llvm-3.6.1.src/projects $ mkdir libunwind/build -llvm-3.6.1.src/projects $ cd libunwind/build -llvm-3.6.1.src/projects/libunwind/build $ cmake -DLLVM_PATH=../../.. -DLIBUNWIND_ENABLE_SHARED=0 .. -llvm-3.6.1.src/projects/libunwind/build $ make -llvm-3.6.1.src/projects/libunwind/build $ cp lib/libunwind.a $PREFIX/lib/ -llvm-3.6.1.src/projects/libunwind/build $ cd cd ../../../../ +$ curl -O http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz +$ tar xf llvm-3.7.0.src.tar.xz +$ cd llvm-3.7.0.src/projects/ +llvm-3.7.0.src/projects $ curl http://llvm.org/releases/3.7.0/libcxxabi-3.7.0.src.tar.xz | tar xJf - +llvm-3.7.0.src/projects $ mv libcxxabi-3.7.0.src libcxxabi +llvm-3.7.0.src/projects $ curl http://llvm.org/releases/3.7.0/libunwind-3.7.0.src.tar.xz | tar xJf - +llvm-3.7.0.src/projects $ mv libunwind-3.7.0.src libunwind +llvm-3.7.0.src/projects $ mkdir libunwind/build +llvm-3.7.0.src/projects $ cd libunwind/build +llvm-3.7.0.src/projects/libunwind/build $ cmake -DLLVM_PATH=../../.. -DLIBUNWIND_ENABLE_SHARED=0 .. +llvm-3.7.0.src/projects/libunwind/build $ make +llvm-3.7.0.src/projects/libunwind/build $ cp lib/libunwind.a $PREFIX/lib/ +llvm-3.7.0.src/projects/libunwind/build $ cd ../../../../ $ du -h musldist/lib/libunwind.a 164K musldist/lib/libunwind.a $ |