From nobody Sat May 06 05:48:08 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QCxRY4GHpz4953c; Sat, 6 May 2023 05:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QCxRY1KFXz3Dsw; Sat, 6 May 2023 05:48:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683352089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05g1msEM10X0+r4V3Y7XZ09ITdgh75xVdi0WGNsJu6E=; b=Fl62CuEaWMXtV+bEOWez/4ihPrSTe2jEILgY1YXU0fvcuhiLRM3nAhwO2lpg+Xrq0RO54d ozqUCsyEJxbgU1Q0S9OT7pAZlNRe+w5tfS7/emIvZv2/pG0p/LO3YKI365SuwL08c6uOyb RefZupds4ENyyHjBFW7QbqUmypLn23PRJ/SzI8Y31O9BmOz1A88jjzxhf+tml9hHyy2eZA KQZJ25hE6n0mRVsv4lUoOoqFRF4JBgDuQ1vkT0A0Pn0W1+LFpr/Z6xqBo8nf6KjS5ZMf80 eEMqnG3QM3ULqWQ9+BYP41EJF0KzAIS6hWpjXId4ujtrqihgQdIVVVyi+w388w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683352089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05g1msEM10X0+r4V3Y7XZ09ITdgh75xVdi0WGNsJu6E=; b=Opfcf40Uvq6d9TAbvbFt9wF1m2VfJOww4XQ0oZQBn8reVGUddz4z53Iw7sYjtgYyq0+w7m ZZkiWaycpua6Rpws3JMayvWWv73WFr4ib9vBS5o/bFVeUV8tsd4Nnh16ruKSH0SUixaOWJ XXSiDl8Mt7QQGeJDdtWPMqWpWBBLNTU4YifZ+F+rV2cR6tCF4miKDYwsQ/F2PXO3htY29u Ow91KXSuFCDbbf2J7rDZF9ssssjq4bghoMBLamN6QbCgwozTeKKCoHfV1zqse2SmyTO/n1 MW0b+qSZ7uqOwZk3AKWnI5LXYnNdKAar9GK+774kUAEvBa7n+7K7Xr6PiybB6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683352089; a=rsa-sha256; cv=none; b=efizzUSyhhsTq7LDcpOXy0hc+oKbytRrI/lLLbX0DIspyqXCjZFSAg2GCedYHuxCZ7BHG+ eoMD9ALGU6K+fxdOGZm6t/C1AEN/WtYQnAJMYgYYXhwmsrdvPEvAYcEzLMXhgkMtODG+mw OVv8T4iSyMkvUCYe2bz3rY11vyD0wXfkHNh6PimqlcU4nk4uhaYZwxtH2EmxQlnKTTLuWX s8UFRyfNRdSYZGL0xG6LS5EteB8eEcpM0kXRW2wQ1hOxhf66zfhUtMHXNkdZlmON5E+jeo PrCxzOv8+E+bwE4Vpzd03BCLjARsERzPhOB4UVkwz0br2jTSxjGkWKlvwAjm8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QCxRX74SwzPsb; Sat, 6 May 2023 05:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3465m8Cl031135; Sat, 6 May 2023 05:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3465m8uk031134; Sat, 6 May 2023 05:48:08 GMT (envelope-from git) Date: Sat, 6 May 2023 05:48:08 GMT Message-Id: <202305060548.3465m8uk031134@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 670abe5a7d0a - main - Mk/Uses/cargo.mk: Strip features defined by CPUTYPE for aarch64 and armv7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 670abe5a7d0a49bdbd2fe7e536fda354a89dea3c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=670abe5a7d0a49bdbd2fe7e536fda354a89dea3c commit 670abe5a7d0a49bdbd2fe7e536fda354a89dea3c Author: Daniel Engberg AuthorDate: 2023-05-06 05:41:42 +0000 Commit: Daniel Engberg CommitDate: 2023-05-06 05:47:44 +0000 Mk/Uses/cargo.mk: Strip features defined by CPUTYPE for aarch64 and armv7 Strip features from CPUTYPE set by make.conf as these are not supported by Rust compiler and causes build failures Approved by: rust (pkubaj) Differential Revision: https://reviews.freebsd.org/D39889 --- Mk/Uses/cargo.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 50146372fee1..b9c5e967755e 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -149,6 +149,8 @@ WITH_LTO= yes RUSTFLAGS+= ${CFLAGS:M-march=*:S/-march=/-C target-cpu=/} . elif ${ARCH:Mpowerpc*} RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/:S/power/pwr/} +. elif ${ARCH} == aarch64 || ${ARCH} == armv7 +RUSTFLAGS+= -C target-cpu=${CPUTYPE:C/\+.+//g} . else RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} . endif