svn commit: r524242 - head/lang/rust

[Tobias Kortkamp]

Author: tobik
Date: Mon Jan 27 06:21:25 2020
New Revision: 524242
URL: https://svnweb.freebsd.org/changeset/ports/524242

Log:
  Unbreak lang/rust-nightly after r524013

Modified:
  head/lang/rust/Makefile

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Mon Jan 27 05:33:13 2020	(r524241)
+++ head/lang/rust/Makefile	Mon Jan 27 06:21:25 2020	(r524242)
@@ -42,11 +42,6 @@ USES=		pkgconfig python:3.3+,build ssl tar:xz
 
 CONFLICTS_INSTALL?=	rust-nightly
 
-# lang/rust-bootstrap builds the bundled libgit2 and using the patch
-# to fix runtime with system libgit2 is incompatible with it.  Keep
-# it separate.
-EXTRA_PATCHES=	${PATCHDIR}/libgit2
-
 PLIST_FILES=	lib/rustlib/components \
 		lib/rustlib/rust-installer-version
 
@@ -81,6 +76,12 @@ _CARGO_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTR
 
 .include <bsd.port.pre.mk>
 
+.if exists(${PATCHDIR}/libgit2)
+# lang/rust-bootstrap builds the bundled libgit2 and using the patch
+# to fix runtime with system libgit2 is incompatible with it.  Keep
+# it separate.
+EXTRA_PATCHES+=	${PATCHDIR}/libgit2
+.endif
 .if exists(${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX})
 EXTRA_PATCHES+=	${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX}
 .endif