From nobody Tue Aug 8 20:14:14 2023 X-Original-To: dev-commits-src-all@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 4RL4CV5XW6z4q2l4; Tue, 8 Aug 2023 20:14:14 +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 4RL4CV4yxkz4kZG; Tue, 8 Aug 2023 20:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691525654; 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=QyI6wJRrn8Jpp5rrc28CJhP7rwbxFfIp1i9aFENsK4U=; b=HUCmSeabjfyVSdNOzN+QMLDBtOUe30pme3+AR7namxJxynmapTKS8ZU0gwb5hj6z6alfeL whdUDQoB8mhRgTheR4JWuIy9K7DRFx0CWZOjrX+zYbq0w8N+naa+PGHdiVAcyxXgUhr8zV 3WER3RjtAsEQBMjnqstX/f+g1TtPgNl5QemNMRibjMv2UTHRBWzQ8P2OoUDJdnKMt9vuTE 4t7rD8UZRtKsqgSxXj3kxs0lbo4SWIDSKQeJJtJ2NyNtw4AGBE9gOImQRpiMpellcZV5Zb +gBiydtJaPur2CUdrgTk/+TEX6ann2r1SDDc8TO1lBXB1mGuIk1P+XmgETTgNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691525654; 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=QyI6wJRrn8Jpp5rrc28CJhP7rwbxFfIp1i9aFENsK4U=; b=jAVYDELbMoV2lMu1MH4qM2yLL6uxDbNAPJ8kcKBuixNnpEs6jx5J/xECRz7t6Wt609jMe7 lZU8hwRscPn3OdicCl82IEr5jXQ+kkB+Pfihc26x8zFFuN+ZpIJfezZDsema81ygawigJa oSER7//G8PItATX/haHNv/XDa1kkVzHsKVmi+2VLM3lVlvX34eVl/m1fWZd8FSRNq/uvhb 7xs5f6a3j7m0dukxHP/6N+bfG1FrgX4TIAQy3V6w01rnpn+Mx335WYrrWVXu/OwJYJIxbX FteCmIrIMPIZJHi1BL5VmPam+uOq7yWUidBy/k/gC/t2lJWlXQmfkH0nuY5AAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691525654; a=rsa-sha256; cv=none; b=lsai5XIWuN64WhGhRD2/SpXFeAj5bNfKvlbYqWcqvsDMoT3p1l1zxpx+11mLnZ7JCrU6mg se5lNOsoWkwJQ4FnmnDqqyvr3SGsgWNvjBdYxtxRG4Hy4MZRgpXzp9hAtRytl78FZvvd9T MqHMNb8ncn83GTk2nt+nYtWYpREbjtjpmc4PLVbq1Mb8E5COtw/ZbHT1ZdnoA7FGpQm+dR gZMdkl3MfLYUMj8VXOP6NEPVlMzFsOmWvRQGnwHQ/PTIhH50kdiJHXYaWtHKFXSs7HrQOA 9X1y0fMWGlYB0CMuCCbNwVvXnYY4WbT5uJ8UZaBETwObXLuu92NsZ4eHxzobFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RL4CV44H5zn3q; Tue, 8 Aug 2023 20:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378KEED4007089; Tue, 8 Aug 2023 20:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378KEEkC007088; Tue, 8 Aug 2023 20:14:14 GMT (envelope-from git) Date: Tue, 8 Aug 2023 20:14:14 GMT Message-Id: <202308082014.378KEEkC007088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 458e0c1b6673 - main - local.sys.dirdeps.mk: Allow CROSS_TARGET_FLAGS to be overridden List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 458e0c1b667354a45cb233ea7fc0256934e15301 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=458e0c1b667354a45cb233ea7fc0256934e15301 commit 458e0c1b667354a45cb233ea7fc0256934e15301 Author: Stephen J. Kiernan AuthorDate: 2023-08-08 20:11:27 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-08-08 20:11:27 +0000 local.sys.dirdeps.mk: Allow CROSS_TARGET_FLAGS to be overridden Use ?= when setting CROSS_TARGET_FLAGS so we do not override it if another file already has set it. Reviewed by: sjg Obtained from: Juniper Networks, Inc. --- share/mk/local.sys.dirdeps.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/local.sys.dirdeps.mk b/share/mk/local.sys.dirdeps.mk index f06b4a33f1f7..9fdfab588035 100644 --- a/share/mk/local.sys.dirdeps.mk +++ b/share/mk/local.sys.dirdeps.mk @@ -122,7 +122,7 @@ ${var}= ${HOST_${var}} FREEBSD_REVISION!= sed -n '/^REVISION=/{s,.*=,,;s,",,g;p; }' ${SRCTOP}/sys/conf/newvers.sh .export FREEBSD_REVISION .endif -CROSS_TARGET_FLAGS= -target ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION} +CROSS_TARGET_FLAGS?= -target ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION} CFLAGS+= ${CROSS_TARGET_FLAGS} ACFLAGS+= ${CROSS_TARGET_FLAGS} .endif