diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
| commit | dc0db358abe19481e475e10c32149b53370f1a1c (patch) | |
| tree | ab8ce99c4b255ce46f99ef402c27916055b899ee /vendor/libz-sys/build.rs | |
| parent | Releasing progress-linux version 1.71.1+dfsg1-2~progress7.99u1. (diff) | |
| download | rustc-dc0db358abe19481e475e10c32149b53370f1a1c.tar.xz rustc-dc0db358abe19481e475e10c32149b53370f1a1c.zip | |
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/libz-sys/build.rs')
| -rw-r--r-- | vendor/libz-sys/build.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vendor/libz-sys/build.rs b/vendor/libz-sys/build.rs index a9a9d8ef9..a0b8eaf93 100644 --- a/vendor/libz-sys/build.rs +++ b/vendor/libz-sys/build.rs @@ -18,15 +18,14 @@ fn main() { } // Don't run pkg-config if we're linking statically (we'll build below) and - // also don't run pkg-config on macOS/FreeBSD/DragonFly. That'll end up printing + // also don't run pkg-config on FreeBSD/DragonFly. That'll end up printing // `-L /usr/lib` which wreaks havoc with linking to an OpenSSL in /usr/local/lib - // (Homebrew, Ports, etc.) + // (Ports, etc.) let want_static = cfg!(feature = "static") || env::var("LIBZ_SYS_STATIC").unwrap_or(String::new()) == "1"; if !want_static && !target.contains("msvc") && // pkg-config just never works here - !(host_and_target_contain("apple") || - host_and_target_contain("freebsd") || + !(host_and_target_contain("freebsd") || host_and_target_contain("dragonfly")) { // Don't print system lib dirs to cargo since this interferes with other |