From nobody Sat Dec 25 11:55:43 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 DC23F18F2FEE; Sat, 25 Dec 2021 11:55:47 +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 4JLj760qkdz4lHv; Sat, 25 Dec 2021 11:55:45 +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 BE43E16B56; Sat, 25 Dec 2021 11:55:43 +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 1BPBthC7006690; Sat, 25 Dec 2021 11:55:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPBtheu006689; Sat, 25 Dec 2021 11:55:43 GMT (envelope-from git) Date: Sat, 25 Dec 2021 11:55:43 GMT Message-Id: <202112251155.1BPBtheu006689@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: 65d1b80dc114 - stable/12 - Add various CFLAGS/LDADD overrides for the output target file. 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: 65d1b80dc1140b5baf0eba803d76dbaf4c273838 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640433346; 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=n1fgvVsdgYwYlWV+ZPaCvMJjmIYL2E/ceY1gcBaCm74=; b=NBW4OCaKGp2l8i9JEoevkZwjkLR9nfvoDKJ7aMdmMB4NUjNZAzPLURJl5pLYcxTuoHb4UH TgK7gC9Xii31MLyjc5sNJLAGnaslSqlf+jQID4lfs1DFHfABzyK3OcUaHTgcV+nZ7p2K1Q VxGT0iwOMoj+YYBQCagwLOUMW8xA06RCi5Ha/iD2SeGC1FAdNTwoX4ViXa3wQqhziBaXMo quxJR4gVNvpO0zhzoxufQsAyCF4PG1vIz2BCqC/vhsU7X1AbR3pjdnJv4k60I56sJt5Oqc eUBuSS8SeCifeMemnpoL3Rc12v560lsnBnJgeHA/3A3DiCLjdxXEXyBKp72IsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640433346; a=rsa-sha256; cv=none; b=Pfd8dTP7R1L7iF505BtWVQ8P97+indbW9u5bqFGXreKvN2CqR8egDC12C2SN6loY3XgDs/ RaO8+ycKiWGVL8yZZsobQlpaBK/UdwION0bjqxkj1abCI37NhLgncUXthepIG6Q0tzEf+l uWl1PShqCawWpRvN/sV89CKrwRJaC8zJXJFPMkvJh4D+GMNgpaVlp4TgwkaTTNAqlUQOsN FE64qSeHiazel7mV87J8okfEYvv1Al7Ddfx7J14JD3wIpJ7FFbam6lgXVctBe9f5nk2uBr G8F+i4oWqbyMI/wbkSA34nqGucWNCNZllj0kpoBMFD5iBTAOtMXe7uL5Eop8KA== 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=65d1b80dc1140b5baf0eba803d76dbaf4c273838 commit 65d1b80dc1140b5baf0eba803d76dbaf4c273838 Author: Bryan Drewery AuthorDate: 2019-06-15 17:08:24 +0000 Commit: Dimitry Andric CommitDate: 2021-12-25 11:51:17 +0000 Add various CFLAGS/LDADD overrides for the output target file. Sponsored by: DellEMC (cherry picked from commit 48da57b47ff1425360f396ea799e05e939d1e1ce) --- share/mk/bsd.README | 17 +++++++++++++++++ share/mk/bsd.sys.mk | 8 ++++++++ 2 files changed, 25 insertions(+) diff --git a/share/mk/bsd.README b/share/mk/bsd.README index c4db43ea5699..ef93c55f73fc 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -125,10 +125,16 @@ The following variables are common: AFLAGS.${SRC} Flags dependent on source file name. +AFLAGS.${TARGET} + Flags dependent on output file name. ACFLAGS.${SRC} Flags dependent on source file name. +ACFLAGS.${TARGET} + Flags dependent on output file name. CFLAGS.${SRC} Flags dependent on source file name. +CFLAGS.${TARGET} + Flags dependent on output file name. CFLAGS.${COMPILER_TYPE} Flags dependent on compiler added to CFLAGS. CFLAGS.${MACHINE_ARCH} @@ -142,6 +148,8 @@ CXXFLAGS.${MACHINE_ARCH} Architectural flags added to CXXFLAGS. CXXFLAGS.${SRC} Flags dependent on source file name. +CXXFLAGS.${TARGET} + Flags dependent on output file name. COMPILER_FEATURES A list of features that the compiler supports. Zero or more of: @@ -336,14 +344,23 @@ LDADD Additional loader objects. Usually used for libraries. LDADD=-lutil -lcompat +LDADD.${TAREGT} + Loader objects dependent on output file name. + LDFLAGS Additional loader flags. Passed to the loader via CC, since that's used to link programs as well, so loader specific flags need to be prefixed with -Wl, to work. +LDFLAGS.${TARGET} + Flags dependent on output file name. + LIBADD Additional libraries. This is for base system libraries and is only valid inside of the /usr/src tree. Use LIBADD=name instead of LDADD=-lname. +LIBADD.${TARGET} + Libraries dependent on output file name. + LINKS The list of binary links; should be full pathnames, the linked-to file coming first, followed by the linked file. The files are hard-linked. For example, to link diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index e787d4f439df..5e9b8ed51b5a 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -253,6 +253,7 @@ DEBUG_FILES_CFLAGS?= -g .if ${MK_WARNS} != "no" CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${COMPILER_TYPE}} CFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}} +CFLAGS+= ${CWARNFLAGS.${.TARGET:T}} CXXFLAGS+= ${CXXWARNFLAGS:M*} ${CXXWARNFLAGS.${COMPILER_TYPE}} CXXFLAGS+= ${CXXWARNFLAGS.${.IMPSRC:T}} .endif @@ -261,11 +262,18 @@ CFLAGS+= ${CFLAGS.${COMPILER_TYPE}} CXXFLAGS+= ${CXXFLAGS.${COMPILER_TYPE}} AFLAGS+= ${AFLAGS.${.IMPSRC:T}} +AFLAGS+= ${AFLAGS.${.TARGET:T}} ACFLAGS+= ${ACFLAGS.${.IMPSRC:T}} +ACFLAGS+= ${ACFLAGS.${.TARGET:T}} CFLAGS+= ${CFLAGS.${.IMPSRC:T}} +CFLAGS+= ${CFLAGS.${.TARGET:T}} CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}} +CXXFLAGS+= ${CXXFLAGS.${.TARGET:T}} LDFLAGS+= ${LDFLAGS.${LINKER_TYPE}} +LDFLAGS+= ${LDFLAGS.${.TARGET:T}} +LDADD+= ${LDADD.${.TARGET:T}} +LIBADD+= ${LIBADD.${.TARGET:T}} .if defined(SRCTOP) # Prevent rebuilding during install to support read-only objdirs.