diff options
| author | rillig <rillig@pkgsrc.org> | 2020-06-14 11:19:34 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-06-14 11:19:34 +0000 |
| commit | cf5a948845cad8de2bd32838b5160b0eb9c15eb2 (patch) | |
| tree | d7858a66174f98d7d4016a0fce46bd4e0fe4bea2 /lang/rust/cargo.mk | |
| parent | 6a1b6f47b3f34fea7e431e6f315e473d4b8411f2 (diff) | |
| download | pkgsrc-cf5a948845cad8de2bd32838b5160b0eb9c15eb2.tar.gz | |
lang/rust: fix unsatisfiable condition in cargo.mk
The condition had been the same as in Makefile before 1.174.
Testing for OPSYS was unnecessary since that is included in
MACHINE_PLATFORM as well.
The ${VAR} syntax is easier readable since the number of exclamation
marks matches the number of negations, contrary to !empty, which is
effectively a positive test.
Swapped the order of the conditions since it is easier to read
"generally, but not" than "not this and the general case".
Diffstat (limited to 'lang/rust/cargo.mk')
| -rw-r--r-- | lang/rust/cargo.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/rust/cargo.mk b/lang/rust/cargo.mk index 3a8ebbac98b..abba173d573 100644 --- a/lang/rust/cargo.mk +++ b/lang/rust/cargo.mk @@ -1,4 +1,4 @@ -# $NetBSD: cargo.mk,v 1.15 2020/06/08 22:37:28 he Exp $ +# $NetBSD: cargo.mk,v 1.16 2020/06/14 11:19:34 rillig Exp $ # # Common logic that can be used by packages that depend on cargo crates # from crates.io. This lets existing pkgsrc infrastructure fetch and verify @@ -42,8 +42,8 @@ EXTRACT_DIR.${_crate}.crate?= ${CARGO_VENDOR_DIR} .include "../../mk/bsd.prefs.mk" # Triggers NetBSD ld.so bug (PR toolchain/54192) -.if ${OPSYS} == "NetBSD" && !empty(MACHINE_PLATFORM:MNetBSD-9.99.*) && \ - !empty(MACHINE_PLATFORM:MNetBSD-[1-9][0-9].*) +# See Makefile for further information. +.if ${MACHINE_PLATFORM:MNetBSD-[1-9].*} && !${MACHINE_PLATFORM:MNetBSD-9.99.*} MAKE_JOBS_SAFE= no .endif |