Date: Sun, 2 Dec 2012 12:01:09 GMT From: Garrett Cooper <yanegomi@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: conf/174050: bsd.own.mk: move MK_CLANG_EXTRAS line further down in bsd.own.mk to not install with WITHOUT_TOOLCHAIN set Message-ID: <201212021201.qB2C19h7099953@red.freebsd.org> Resent-Message-ID: <201212021210.qB2CA0Iw051619@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174050
>Category: conf
>Synopsis: bsd.own.mk: move MK_CLANG_EXTRAS line further down in bsd.own.mk to not install with WITHOUT_TOOLCHAIN set
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 02 12:10:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Garrett Cooper
>Release: n/a
>Organization:
EMC Isilon
>Environment:
n/a
>Description:
The attached patch corrects the fact that if WITHOUT_TOOLCHAIN is set MK_CLANG_EXTRAS is still potentially set to yes.
The attached patch just consolidates the checks (probably an unmeasurable performance difference), and makes protects against future bugs if MK_CLANG_EXTRAS is used somewhere else in the tree other than clang directories:
$ find . -name Makefile\* -or -name \*.mk | xargs grep -l MK_CLANG_EXTRAS
./share/mk/bsd.own.mk
./lib/clang/libllvmx86disassembler/Makefile
./lib/clang/libllvmipo/Makefile
./lib/clang/Makefile
./lib/clang/libllvmsupport/Makefile
./lib/clang/libllvmipa/Makefile
./lib/clang/libllvmmc/Makefile
./lib/clang/libllvmscalaropts/Makefile
./lib/clang/libllvmmcjit/Makefile
./lib/clang/libllvmanalysis/Makefile
./lib/clang/libllvmtransformutils/Makefile
./usr.bin/clang/Makefile
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk (revision 243747)
+++ share/mk/bsd.own.mk (working copy)
@@ -540,10 +540,6 @@
MK_CTF:= no
.endif
-.if ${MK_CLANG} == "no"
-MK_CLANG_EXTRAS:= no
-.endif
-
.if ${MK_CRYPT} == "no"
MK_OPENSSL:= no
MK_OPENSSH:= no
@@ -587,6 +583,7 @@
.if ${MK_CLANG} == "no"
MK_CLANG_IS_CC:= no
+MK_CLANG_EXTRAS:= no
.endif
#
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212021201.qB2C19h7099953>