diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-30 10:51:59 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-06-02 22:54:51 -0700 |
| commit | 235bcbdb1d53ccea5c70b92febdd1a38044f67c8 (patch) | |
| tree | 9df2a25fe2114c35efbf64fbac73f3bb5ff163ee /libssh2-sys/lib.rs | |
| parent | 6e3a64889ff9eaf5577e6c394de2f6030e06569d (diff) | |
| download | ssh2-rs-235bcbdb1d53ccea5c70b92febdd1a38044f67c8.zip | |
Overhaul the build on windows
* Have an entirely separate path for windows builds
* Run `make install` on unix builds for libssh2
* On Windows, first detect whether `make` is available
* Use the specific `win32/GNUmakefile` for windows instead of the standard
configure/make procedure for unix.
* Continue doing a manual install on Windows, but don't rely on `pkg-config`
existing and don't emit a pkg-config file.
One day this may support MSVC-based builds, but support is not added at this
time.
Diffstat (limited to 'libssh2-sys/lib.rs')
| -rw-r--r-- | libssh2-sys/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libssh2-sys/lib.rs b/libssh2-sys/lib.rs index 26c4e58..6ac80d4 100644 --- a/libssh2-sys/lib.rs +++ b/libssh2-sys/lib.rs @@ -3,8 +3,10 @@ extern crate libc; +#[cfg(not(target_env = "msvc"))] extern crate libz_sys; -#[cfg(unix)] extern crate openssl_sys; +#[cfg(unix)] +extern crate openssl_sys; use libc::{c_int, size_t, c_void, c_char, c_long, c_uchar, c_uint, c_ulong}; use libc::ssize_t; |