From nobody Tue Dec 21 16:02:07 2021 X-Original-To: dev-commits-src-branches@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 1011E18EC367; Tue, 21 Dec 2021 16:02:08 +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 4JJLnC436yz3tXs; Tue, 21 Dec 2021 16:02:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6ACD44D06; Tue, 21 Dec 2021 16:02:07 +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 1BLG275r026530; Tue, 21 Dec 2021 16:02:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLG27W5026529; Tue, 21 Dec 2021 16:02:07 GMT (envelope-from git) Date: Tue, 21 Dec 2021 16:02:07 GMT Message-Id: <202112211602.1BLG27W5026529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e9cfd2dc7e20 - stable/12 - Partially MFC 7d0c2b1131b68, to enable MAKE_PARAMS per target_arch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e9cfd2dc7e207b65ed6c9aa706b3a2872f24f2be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640102527; 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=B0mz4xdcj3/3DQXSlhU3h2f8WW9s4szEfZHn4lKedqs=; b=grPN33c0EZdKITzbGXKXZenim33EouD3LH+twbFPiJr32woJdXv9N1NA6O21CcWrOPrMXO HD0InmE1m0K9aASwbKQm60zYcZPy/lLzqducNqC24mByNtAuYvSA0S/Ghou05TaELN0QYe V3+dK75liQPjxlePsdWUjBfrweZ1OGXeR05RLuy2GeWSqQF758x1+h9RdKDpiwy9cw9aiq Or77NR2+HZVFOFyhkQJxh3OLMn/3RISNx+8AUoVTsjlmoiF269tJbn1M0YvjtuEDigDP3f Ki5VU44moH9SHUOfTF8uxh3jU4fho/bV6lFD3ftRI9cDimk71smayo9/HT7YAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640102527; a=rsa-sha256; cv=none; b=A8hksnWEv8cO/eaIPimk0iW0/MhESj4CH1VT3jxVuxaFYUeL9V+p6mkk8wgT2/sLztuXGK HWTgsOSXqeq5vfqSWIl1YRznXxAYFP61yNm4akIOO9fe6oQHHrSxiqn+se9GHDPurLOGav rrc2dVBmPZA96yNy5oSjBrHDxP3vZuKDCBicwGx9Lx4S81A8NBtn6TjkG6rFohfp/Qu+q9 ataIK+jZ9R6yFc1KSF3Jei0zdTJ3z8X8im2tx6JqNbLU/3PT9CX26xUwQ3REIJpTK3+QDF 83BrOOWDeFAiy2Gx8hSh2EFzVfcKZnPBmz7SB6PJ3eoJiszTc4Z201VzKNeP2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e9cfd2dc7e207b65ed6c9aa706b3a2872f24f2be commit e9cfd2dc7e207b65ed6c9aa706b3a2872f24f2be Author: John Baldwin AuthorDate: 2020-08-17 20:11:43 +0000 Commit: Dimitry Andric CommitDate: 2021-12-21 15:56:30 +0000 Partially MFC 7d0c2b1131b68, to enable MAKE_PARAMS per target_arch This commit made it possible to use different MAKE_PARAMS for each ${target_arch} value, instead of forcing the same MAKE_PARAMS for all of the ${target_arch} values under one target. I.e, after this you can build arm.arm with gcc, while building arm.armv6 and arm.armv7 with clang. (cherry picked from commit 7d0c2b1131b68f5b120b2df0784cb9da5688f8d9) --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 9ad32d27fc1d..5f80dd5382a3 100644 --- a/Makefile +++ b/Makefile @@ -578,7 +578,7 @@ universe_${target}_worlds: .PHONY _need_clang_${target}_${target_arch} != \ env TARGET=${target} TARGET_ARCH=${target_arch} \ ${SUB_MAKE} -C ${.CURDIR} -f Makefile.inc1 test-system-compiler \ - ${MAKE_PARAMS_${target}} -V MK_CLANG_BOOTSTRAP 2>/dev/null || \ + ${MAKE_PARAMS_${target_arch}} -V MK_CLANG_BOOTSTRAP 2>/dev/null || \ echo unknown .export _need_clang_${target}_${target_arch} .endif @@ -586,7 +586,7 @@ _need_clang_${target}_${target_arch} != \ _need_lld_${target}_${target_arch} != \ env TARGET=${target} TARGET_ARCH=${target_arch} \ ${SUB_MAKE} -C ${.CURDIR} -f Makefile.inc1 test-system-linker \ - ${MAKE_PARAMS_${target}} -V MK_LLD_BOOTSTRAP 2>/dev/null || \ + ${MAKE_PARAMS_${target_arch}} -V MK_LLD_BOOTSTRAP 2>/dev/null || \ echo unknown .export _need_lld_${target}_${target_arch} .endif @@ -600,14 +600,14 @@ _need_lld_${target}_${target_arch} != \ # XXX: Passing HOST_OBJTOP into the PATH would allow skipping legacy, # bootstrap-tools, and cross-tools. Need to ensure each tool actually # supports all TARGETS though. -MAKE_PARAMS_${target}+= \ +MAKE_PARAMS_${target_arch}+= \ XCC="${HOST_OBJTOP}/tmp/usr/bin/cc" \ XCXX="${HOST_OBJTOP}/tmp/usr/bin/c++" \ XCPP="${HOST_OBJTOP}/tmp/usr/bin/cpp" .endif .if defined(_need_lld_${target}_${target_arch}) && \ ${_need_lld_${target}_${target_arch}} == "yes" -MAKE_PARAMS_${target}+= \ +MAKE_PARAMS_${target_arch}+= \ XLD="${HOST_OBJTOP}/tmp/usr/bin/ld" .endif .endfor @@ -630,7 +630,7 @@ universe_${target}_${target_arch}: universe_${target}_prologue .MAKE .PHONY ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \ TARGET=${target} \ TARGET_ARCH=${target_arch} \ - ${MAKE_PARAMS_${target}} \ + ${MAKE_PARAMS_${target_arch}} \ > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \ (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \ "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \ @@ -694,7 +694,7 @@ universe_kernconf_${TARGET}_${kernel}: .MAKE ${SUB_MAKE} ${JFLAG} buildkernel \ TARGET=${TARGET} \ TARGET_ARCH=${TARGET_ARCH_${kernel}} \ - ${MAKE_PARAMS_${TARGET}} \ + ${MAKE_PARAMS_${TARGET_ARCH}} \ KERNCONF=${kernel} \ > _.${TARGET}.${kernel} 2>&1 || \ (echo "${TARGET} ${kernel} kernel failed," \