svn commit: r569245 - head/lang/rust-bootstrap

[Tobias Kortkamp]

Author: tobik
Date: Fri Mar 26 07:34:49 2021
New Revision: 569245
URL: https://svnweb.freebsd.org/changeset/ports/569245

Log:
  lang/rust-bootstrap: Unbreak aarch64 bootstrap
  
  Something goes wrong when it is built with LLVM > 9.  Build it with
  llvm90 for the time being.
  
  rustc -Cllvm-args="..." with: Unknown command line argument '-generate-arange-section'.  Try: 'rustc -Cllvm-args="..." with --help'
  rustc -Cllvm-args="..." with: Unknown command line argument '-mergefunc-use-aliases'.  Try: 'rustc -Cllvm-args="..." with --help'
  rustc -Cllvm-args="..." with: Unknown command line argument '-preserve-alignment-assumptions-during-inlining=false'.  Try: 'rustc -Cllvm-args="..." with --help'
  
  or when built with llvm.assertions=true:
  
  Assertion failed: (hasOptions() && "No options specified!"), function ParseCommandLineOptions, file src/llvm-project/llvm/lib/Support/CommandLine.cpp, line 1344.

Modified:
  head/lang/rust-bootstrap/Makefile

Modified: head/lang/rust-bootstrap/Makefile
==============================================================================
--- head/lang/rust-bootstrap/Makefile	Fri Mar 26 06:55:45 2021	(r569244)
+++ head/lang/rust-bootstrap/Makefile	Fri Mar 26 07:34:49 2021	(r569245)
@@ -5,7 +5,7 @@
 # for the next lang/rust update.
 PORTNAME=	rust
 PORTVERSION=	1.50.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:rust \
 		LOCAL/mikael:armbase \
@@ -39,6 +39,7 @@ FLAVORS=	aarch64 amd64 armv6 armv7 i386 powerpc64_elfv
 FLAVOR?=	${FLAVORS:[1]}
 
 aarch64_PKGNAMEPREFIX=		aarch64-
+aarch64_BUILD_DEPENDS=		llvm90>0:devel/llvm90
 amd64_PKGNAMEPREFIX=		amd64-
 armv6_PKGNAMEPREFIX=		armv6-
 armv7_PKGNAMEPREFIX=		armv7-
@@ -54,6 +55,10 @@ USE_GCC=	9:build
 .endif
 # for openssl-src crate
 USE_PERL5=	build
+.if ${FLAVOR} == aarch64
+CC=		clang90
+CXX=		clang++90
+.endif
 PATCHDIR=	${.CURDIR}/../rust/files
 # Resulting packages are not specific to amd64
 NO_ARCH=	yes