diff options
| author | bors <bors@rust-lang.org> | 2016-05-11 12:07:06 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-11 12:07:06 -0700 |
| commit | 700279f4bf0127bd8b0e2dd821c52a46af31ad8a (patch) | |
| tree | 41023bcaa85e0ec116cac5fe56d2f3de16312246 | |
| parent | e37f8593e42335829e98fed27b8ececbad61a05d (diff) | |
| parent | 3e12c78172159543cdd9162905e6e53b53b36c67 (diff) | |
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.
| -rw-r--r-- | mk/cfg/i686-unknown-linux-musl.mk | 3 | ||||
| -rw-r--r-- | mk/cfg/x86_64-unknown-linux-musl.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mk/cfg/i686-unknown-linux-musl.mk b/mk/cfg/i686-unknown-linux-musl.mk index ac05798c767..4c64402a73e 100644 --- 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 index 9d6dd5c73d7..62a884874bb 100644 --- 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 |