diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-07-20 16:12:48 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-07-20 16:12:48 -0700 |
| commit | 24c5e492751489280f446f4efff1740a6c3e5aa1 (patch) | |
| tree | 333216cc9d704c1583a4f85de5fa3d162c265eae /src/libstd/sys | |
| parent | 7cb157e74d2f190dd338e0f81c07bf427c22e02d (diff) | |
| download | rust-24c5e492751489280f446f4efff1740a6c3e5aa1.tar.gz rust-24c5e492751489280f446f4efff1740a6c3e5aa1.zip | |
std: Fix compiling the standard library on i686-MSVC
This commit fixes building the standard library with the `i686-pc-windows-msvc` target by correcting an included symbol name to the linker.
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/thread_local.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs index a2dbb0f8342..7550b7ce6c3 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.rs @@ -231,9 +231,12 @@ pub static p_thread_callback: unsafe extern "system" fn(LPVOID, DWORD, LPVOID) = on_tls_callback; -#[cfg(target_env = "msvc")] +#[cfg(all(target_env = "msvc", target_pointer_width = "64"))] #[link_args = "/INCLUDE:_tls_used"] extern {} +#[cfg(all(target_env = "msvc", target_pointer_width = "32"))] +#[link_args = "/INCLUDE:__tls_used"] +extern {} #[allow(warnings)] unsafe extern "system" fn on_tls_callback(h: LPVOID, |