From owner-svn-ports-all@freebsd.org Thu Dec 6 17:07:43 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2A34130BC24; Thu, 6 Dec 2018 17:07:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 93D6475AE6; Thu, 6 Dec 2018 17:07:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74D93268D0; Thu, 6 Dec 2018 17:07:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB6H7ga7041539; Thu, 6 Dec 2018 17:07:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB6H7gqM041538; Thu, 6 Dec 2018 17:07:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201812061707.wB6H7gqM041538@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 6 Dec 2018 17:07:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486769 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 486769 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 93D6475AE6 X-Spamd-Result: default: False [-1.88 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.86)[-0.863,0]; NEURAL_HAM_LONG(-0.08)[-0.083,0]; NEURAL_HAM_SHORT(-0.93)[-0.932,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Dec 2018 17:07:43 -0000 Author: jbeich Date: Thu Dec 6 17:07:42 2018 New Revision: 486769 URL: https://svnweb.freebsd.org/changeset/ports/486769 Log: USES=cargo to convert LDFLAGS into RUSTFLAGS Approved by: rust (tobik) Differential Revision: https://reviews.freebsd.org/D18039 Modified: head/Mk/Uses/cargo.mk (contents, props changed) Modified: head/Mk/Uses/cargo.mk ============================================================================== --- head/Mk/Uses/cargo.mk Thu Dec 6 16:51:51 2018 (r486768) +++ head/Mk/Uses/cargo.mk Thu Dec 6 17:07:42 2018 (r486769) @@ -62,15 +62,13 @@ CARGO_TARGET_DIR?= ${WRKDIR}/target # - RUSTC: path of rustc binary (default to lang/rust) # - RUSTDOC: path of rustdoc binary (default to lang/rust) # - RUSTFLAGS: custom flags to pass to all compiler invocations that Cargo performs -# -# XXX LDFLAGS => -C link-arg=$1 (via RUSTFLAGS) CARGO_ENV+= \ CARGO_HOME=${WRKDIR}/cargo-home \ CARGO_BUILD_JOBS=${MAKE_JOBS_NUMBER} \ CARGO_TARGET_DIR=${CARGO_TARGET_DIR} \ RUSTC=${LOCALBASE}/bin/rustc \ RUSTDOC=${LOCALBASE}/bin/rustdoc \ - RUSTFLAGS="${RUSTFLAGS}" + RUSTFLAGS="${RUSTFLAGS} ${LDFLAGS:S/^/-C link-arg=/}" # Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk .if ${ARCH} == amd64 || ${ARCH} == i386