On 6/8/18 10:25 PM, Matt Macy wrote:
> Author: mmacy
> Date: Sat Jun 9 02:25:18 2018
> New Revision: 334867
> URL: https://svnweb.freebsd.org/changeset/base/334867
>
> Log:
> pmc: fix logic in skipping riscv
This would still appear to not be right as eventually riscv will
use llvm. Also, I wonder if the more normal way of handling
this would be to make MK_PMC a BROKEN_OPTION for riscv in
src.opts.mk as then it is centralized in one place.
Similarly, what is the actual compiler requirement? If you need C++11
support for example then it would be better to express this
in terms of COMPILER_FEATURES (and that might also be doable in
src.opts.mk so that it is centralized).
> Modified:
> head/lib/Makefile
> head/usr.sbin/Makefile
>
> Modified: head/lib/Makefile
> ==
> --- head/lib/Makefile Sat Jun 9 02:18:15 2018(r334866)
> +++ head/lib/Makefile Sat Jun 9 02:25:18 2018(r334867)
> @@ -202,7 +202,7 @@ _libdl= libdl
> .endif
>
> SUBDIR.${MK_OPENSSL}+= libmp
> -.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" &&
> ${COMPILER_VERSION} >= 60100) && ${MACHINE_CPUARCH} != "riscv")
> +.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" &&
> ${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv"))
> SUBDIR.${MK_PMC}+= libpmc libpmcstat
> .endif
> SUBDIR.${MK_RADIUS_SUPPORT}+=libradius
>
> Modified: head/usr.sbin/Makefile
> ==
> --- head/usr.sbin/MakefileSat Jun 9 02:18:15 2018(r334866)
> +++ head/usr.sbin/MakefileSat Jun 9 02:25:18 2018(r334867)
> @@ -179,7 +179,7 @@ SUBDIR.${MK_OPENSSL}+=keyserv
> SUBDIR.${MK_PC_SYSINSTALL}+= pc-sysinstall
> SUBDIR.${MK_PF}+=ftp-proxy
> SUBDIR.${MK_PKGBOOTSTRAP}+= pkg
> -.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" &&
> ${COMPILER_VERSION} >= 60100) && ${MACHINE_CPUARCH} != "riscv")
> +.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" &&
> ${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv"))
> SUBDIR.${MK_PMC}+= pmc
> SUBDIR.${MK_PMC}+= pmcannotate
> SUBDIR.${MK_PMC}+= pmccontrol
>
--
John Baldwin
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
