Date: Tue, 31 May 2016 23:14:16 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301086 - head/sys/conf Message-ID: <201605312314.u4VNEGtm045835@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue May 31 23:14:15 2016 New Revision: 301086 URL: https://svnweb.freebsd.org/changeset/base/301086 Log: Define SYSDIR earlier since the defined(FIRMWS) block depends on it. It uses it in a dependency, which won't work if it is not yet defined. Sponsored by: EMC / Isilon Storage Division Modified: head/sys/conf/kmod.mk Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Tue May 31 23:12:43 2016 (r301085) +++ head/sys/conf/kmod.mk Tue May 31 23:14:15 2016 (r301086) @@ -76,6 +76,16 @@ OBJCOPY?= objcopy .include <bsd.compiler.mk> .include "config.mk" +# Search for kernel source tree in standard places. +.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys +.if !defined(SYSDIR) && exists(${_dir}/kern/) +SYSDIR= ${_dir:tA} +.endif +.endfor +.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) +.error "can't find kernel source tree" +.endif + .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S .m # amd64 and mips use direct linking for kmod, all others use shared binaries @@ -266,16 +276,6 @@ ${OBJS}: ${_link} .endif .endfor -# Search for kernel source tree in standard places. -.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. /sys /usr/src/sys -.if !defined(SYSDIR) && exists(${_dir}/kern/) -SYSDIR= ${_dir:tA} -.endif -.endfor -.if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) -.error "can't find kernel source tree" -.endif - .NOPATH: ${_ILINKS} ${_ILINKS}:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605312314.u4VNEGtm045835>