From nobody Wed Mar 27 23:18:59 2024 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 4V4jKb68v9z5Fgrt; Wed, 27 Mar 2024 23:18:59 +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 4V4jKb5gKvz412C; Wed, 27 Mar 2024 23:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711581539; 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=MAfLNe4GOj0aOz4+aEX5UbFCpUIEFSrehIA+MJapWKg=; b=vaj1Y8pncNpCb2DI7pK1k4YwPN+ISo+o868hfUC5du/8H8/GH+HzgaWkkh7TsvgzaHHIrY LM6cvQhsx0N5RKSHbmUP+Gawe16Zc2GoH34n3yzdy7uMjr6M66/b77A2kUilsfFhfcJ1oS 9Nwk7jLa2IHuxHy8uZNB3NMyLG8ZDnbp86t9VNtWIQ/eN2oXrrhLqr5ywb0S8rg999IFYv i8E4jZ1EU/TFUZ0VdSIWEJaYGIj13ClnIg2Ifu9oDi8WYeL701kSJRemQ1Ysa+cbgcVVyN eonU/TLJeD2/qzEo3mnE5JQqDCICIr6PQZTIX1DhROIp7zgrb6WY0tv5u28VOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711581539; a=rsa-sha256; cv=none; b=hjqpcdZqEpmXUS5u70AzdnVxFA/3OSJ6yCga9WIQ/EU2M9XBm0++pUgSjj+5rEdaASBGm1 uzZvpOvQUGjeeD4LdoPHAa5+BPQZar2T9HiwzPF1UkZqQ70/d49gS/Y5M3gPezq648PTdu UsoC9GzRk39HFBPl6IMSW7jtoFyMrreWyqeY+5IS7vpUPRT0SD8VHs71dgFsTP2pO5UXyt tT2sln4pnqgH8tChKAUH3Xc+IMPg/XRq4kyE8gx3S7IVyljVnelUTFROEiomnvdzQFHwYL O4z4QrsColwa4fhYTvmD9G7D72YIsXU0yWM8CmaN3TAsi95dhbvpvFtegilstg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711581539; 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=MAfLNe4GOj0aOz4+aEX5UbFCpUIEFSrehIA+MJapWKg=; b=s27OK4RQjxRcmWNjUdNAhNm/RIB/Z6JUgUSCmb96iukbBoPCs0/vYx9Asa1/nq++CGO/y8 RgkfDWEARAVandfyOAZ1oSSsZWz+nCWS7jwWgByH53G4KwY6n2jQiAcFt+Mm7ODp7USXkv mAkHfC0lnDVZ0qsr9hZjD9+oVdjnbnnoNIbEm0yx+UI3xq8+S72em4RxGE5sWirC1SJdBv uEF7Cjeblqr2jxrAW4UM6Xl5avgN76k9SSxa5ZPG2FL+UWHDqmJ807RM5HokWHGEirA4AP 6WL8EaryV/CBFAv5V/r7QyksSWHYVynrTbKLBC9GP/Rja1uq4dwuPLNWodcT9A== 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 4V4jKb57xpz13fF; Wed, 27 Mar 2024 23:18:59 +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 42RNIxL1006963; Wed, 27 Mar 2024 23:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42RNIxgS006960; Wed, 27 Mar 2024 23:18:59 GMT (envelope-from git) Date: Wed, 27 Mar 2024 23:18:59 GMT Message-Id: <202403272318.42RNIxgS006960@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: 39f6f6f1c6f8 - main - libmagic: Use HOST_CC when compiling hostprog used by build 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: 39f6f6f1c6f81fa93f3d0711d5ea222a8936ffd1 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=39f6f6f1c6f81fa93f3d0711d5ea222a8936ffd1 commit 39f6f6f1c6f81fa93f3d0711d5ea222a8936ffd1 Author: Stephen J. Kiernan AuthorDate: 2024-03-27 22:02:32 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-03-27 23:18:43 +0000 libmagic: Use HOST_CC when compiling hostprog used by build The "mkmagic" program should be built with the host compiler. Only use BTOOLSPATH if not building for host Obtained from: Juniper Networks, Inc. Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D44539 --- lib/libmagic/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile index 5aff4c1a478d..150ddc686241 100644 --- a/lib/libmagic/Makefile +++ b/lib/libmagic/Makefile @@ -59,12 +59,13 @@ magic.mgc: magic CLEANFILES+= mkmagic DEPENDOBJS+= mkmagic build-tools: mkmagic +# For the non-dirdeps build, HOST_CC is CC by default mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c ${INCS} ${BUILD_TOOLS_META} - ${CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ + ${HOST_CC:N${CCACHE_BIN}} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} \ ${.ALLSRC:N*.h:O:u} ${LDADD} .endif -.if ${MK_DIRDEPS_BUILD} == "yes" +.if ${MK_DIRDEPS_BUILD} == "yes" && ${MACHINE} != "host" BTOOLSPATH= ${HOST_OBJTOP}/${RELDIR} .else magic.mgc: mkmagic