Date: Thu, 14 Mar 2019 17:31:46 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495724 - head/Mk/Uses Message-ID: <201903141731.x2EHVk1S003532@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Mar 14 17:31:45 2019 New Revision: 495724 URL: https://svnweb.freebsd.org/changeset/ports/495724 Log: USES=cargo to omit -C link-arg if LDFLAGS is empty DPorts overrides USE_GCC logic and doesn't opt in into SSP_CFLAGS, so its LDFLAGS are empty by default. PR: 236529 Reported by: Antonio Huete Jimenez Modified: head/Mk/Uses/cargo.mk (contents, props changed) Modified: head/Mk/Uses/cargo.mk ============================================================================== --- head/Mk/Uses/cargo.mk Thu Mar 14 17:28:11 2019 (r495723) +++ head/Mk/Uses/cargo.mk Thu Mar 14 17:31:45 2019 (r495724) @@ -65,7 +65,7 @@ CARGO_ENV+= \ CARGO_TARGET_DIR=${CARGO_TARGET_DIR} \ RUSTC=${LOCALBASE}/bin/rustc \ RUSTDOC=${LOCALBASE}/bin/rustdoc \ - RUSTFLAGS="${RUSTFLAGS} -C linker=${CC:Q} ${LDFLAGS:S/^/-C link-arg=/}" + RUSTFLAGS="${RUSTFLAGS} -C linker=${CC:Q} ${LDFLAGS:C/.+/-C link-arg=&/}" # Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk .if ${ARCH} == amd64 || ${ARCH} == i386
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903141731.x2EHVk1S003532>