diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-01-21 15:36:25 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-02-11 11:12:32 -0800 |
| commit | eac0a8bc3070e45047fff57e7b024a059289a36d (patch) | |
| tree | cbcaa9dc371f2b11fe2e9b9d3ee7a3f7a9cfdb8e /src/libstd/sys/windows | |
| parent | 4da4970767ae8fc2e3b6d0c280312bb0f4efeed6 (diff) | |
| download | rust-eac0a8bc3070e45047fff57e7b024a059289a36d.tar.gz rust-eac0a8bc3070e45047fff57e7b024a059289a36d.zip | |
bootstrap: Add directives to not double-link libs
Have all Cargo-built crates pass `--cfg cargobuild` and then add appropriate `#[cfg]` definitions to all crates to avoid linking anything if this is passed. This should help allow libstd to compile with both the makefiles and with Cargo.
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index 6e8090a2235..9fdeb0aef14 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.rs @@ -966,6 +966,9 @@ pub enum EXCEPTION_DISPOSITION { #[link(name = "userenv")] #[link(name = "shell32")] #[link(name = "advapi32")] +#[cfg(not(cargobuild))] +extern {} + extern "system" { pub fn WSAStartup(wVersionRequested: WORD, lpWSAData: LPWSADATA) -> c_int; |