Auto merge of #33561 - alexcrichton:fix-nightiles, r=brson

mk: Fix dependencies of unwind crate on musl The libunwind.a library was accidentally only being included for the standard library, not the new unwind crate which implements an unwinder.
rust-lang · May 11, 2016 · 700279f · 700279f
2 parents e37f859 + 3e12c78
commit 700279f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mk/cfg/i686-unknown-linux-musl.mk b/mk/cfg/i686-unknown-linux-musl.mk
@@ -25,4 +25,5 @@ CFG_THIRD_PARTY_OBJECTS_i686-unknown-linux-musl := crt1.o crti.o crtn.o
 CFG_INSTALLED_OBJECTS_i686-unknown-linux-musl := crt1.o crti.o crtn.o
 
 NATIVE_DEPS_libc_T_i686-unknown-linux-musl += libc.a
-NATIVE_DEPS_std_T_i686-unknown-linux-musl += libunwind.a crt1.o crti.o crtn.o
+NATIVE_DEPS_std_T_i686-unknown-linux-musl += crt1.o crti.o crtn.o
+NATIVE_DEPS_unwind_T_i686-unknown-linux-musl += libunwind.a
diff --git a/mk/cfg/x86_64-unknown-linux-musl.mk b/mk/cfg/x86_64-unknown-linux-musl.mk
@@ -25,4 +25,5 @@ CFG_THIRD_PARTY_OBJECTS_x86_64-unknown-linux-musl := crt1.o crti.o crtn.o
 CFG_INSTALLED_OBJECTS_x86_64-unknown-linux-musl := crt1.o crti.o crtn.o
 
 NATIVE_DEPS_libc_T_x86_64-unknown-linux-musl += libc.a
-NATIVE_DEPS_std_T_x86_64-unknown-linux-musl += libunwind.a crt1.o crti.o crtn.o
+NATIVE_DEPS_std_T_x86_64-unknown-linux-musl += crt1.o crti.o crtn.o
+NATIVE_DEPS_unwind_T_x86_64-unknown-linux-musl += libunwind.a