about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-01 18:16:08 +0000
committerbors <bors@rust-lang.org>2015-10-01 18:16:08 +0000
commitd9d9ca1a025a944c552c027129cec984ffeeb41c (patch)
treefdb5e1502fe7f9c8bbd714de6b103628fff28812
parente82faeb65594302897223b2ca4ee6927fb54625f (diff)
parentb24552e0a5d9d4c72a1e6272c534e245549cd9ae (diff)
downloadrust-d9d9ca1a025a944c552c027129cec984ffeeb41c.tar.gz
rust-d9d9ca1a025a944c552c027129cec984ffeeb41c.zip
Auto merge of #28746 - aidanhs:aphs-musl-linking-no-cxxabi, r=alexcrichton
On reading https://github.com/alexcrichton/port-of-rust/blob/master/musl/Dockerfile I was surprised to see no libcxxabi. I experimented, and it does seem to be unnecessary.

I guess it's a remnant from the 3.6 build.

r? @alexcrichton 
-rw-r--r--src/doc/trpl/advanced-linking.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/doc/trpl/advanced-linking.md b/src/doc/trpl/advanced-linking.md
index 03043f5f737..921f27336f2 100644
--- a/src/doc/trpl/advanced-linking.md
+++ b/src/doc/trpl/advanced-linking.md
@@ -94,8 +94,6 @@ $ # Build libunwind.a
 $ 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