Date: Mon, 11 Aug 2014 17:04:05 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269820 - head/sys/modules Message-ID: <53e8f785.29bb.3ea60116@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Aug 11 17:04:04 2014 New Revision: 269820 URL: http://svnweb.freebsd.org/changeset/base/269820 Log: Similar to r250143, optimize MODULES_OVERRIDE such that SUBDIR isn't automatically defined if MODULES_OVERRIDE is defined Approved by: jmmv (mentor) Reviewed by: imp Phabric: D578 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/modules/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Mon Aug 11 16:57:47 2014 (r269819) +++ head/sys/modules/Makefile Mon Aug 11 17:04:04 2014 (r269820) @@ -8,6 +8,9 @@ SUBDIR_PARALLEL= # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). +.if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES) +SUBDIR=${MODULES_OVERRIDE} +.else SUBDIR= \ ${_3dfx} \ ${_3dfx_linux} \ @@ -830,9 +833,6 @@ _sound= sound _zfs= zfs .endif .endif - -.if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES) -SUBDIR=${MODULES_OVERRIDE} .endif .for reject in ${WITHOUT_MODULES}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e8f785.29bb.3ea60116>