From owner-svn-src-head@freebsd.org Mon Feb 26 03:16:06 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FF25F23701; Mon, 26 Feb 2018 03:16:06 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C1EB37E93D; Mon, 26 Feb 2018 03:16:05 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BCD5E15E30; Mon, 26 Feb 2018 03:16:05 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1Q3G5xE022322; Mon, 26 Feb 2018 03:16:05 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1Q3G4vc022314; Mon, 26 Feb 2018 03:16:04 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201802260316.w1Q3G4vc022314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 26 Feb 2018 03:16:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330004 - in head/stand: . arm efi forth i386 mips powerpc sparc64 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/stand: . arm efi forth i386 mips powerpc sparc64 X-SVN-Commit-Revision: 330004 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2018 03:16:06 -0000 Author: imp Date: Mon Feb 26 03:16:04 2018 New Revision: 330004 URL: https://svnweb.freebsd.org/changeset/base/330004 Log: Add NO_OBJ to those directories that don't make anything. For directories that don't many anything, add NO_OBJ=t just before we include bsd.init.mk. This prevents them from creating an OBJ directory. In addition, prevent defs.mk from creating the machine related links in these cases. They aren't needed and break, at least on stable, the read-only src tree build. Modified: head/stand/arm/Makefile head/stand/defs.mk head/stand/efi/Makefile head/stand/forth/Makefile head/stand/i386/Makefile head/stand/mips/Makefile head/stand/powerpc/Makefile head/stand/sparc64/Makefile Modified: head/stand/arm/Makefile ============================================================================== --- head/stand/arm/Makefile Mon Feb 26 03:05:36 2018 (r330003) +++ head/stand/arm/Makefile Mon Feb 26 03:16:04 2018 (r330004) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + SUBDIR= uboot .include Modified: head/stand/defs.mk ============================================================================== --- head/stand/defs.mk Mon Feb 26 03:05:36 2018 (r330003) +++ head/stand/defs.mk Mon Feb 26 03:16:04 2018 (r330004) @@ -163,6 +163,7 @@ CLEANFILES+=${_ILINKS} all: ${PROG} +.if !defined(NO_OBJ) beforedepend: ${_ILINKS} beforebuild: ${_ILINKS} @@ -190,5 +191,5 @@ ${_ILINKS}: path=`(cd $$path && /bin/pwd)` ; \ ${ECHO} ${.TARGET:T} "->" $$path ; \ ln -fhs $$path ${.TARGET:T} - +.endif .endif # __BOOT_DEFS_MK__ Modified: head/stand/efi/Makefile ============================================================================== --- head/stand/efi/Makefile Mon Feb 26 03:05:36 2018 (r330003) +++ head/stand/efi/Makefile Mon Feb 26 03:16:04 2018 (r330004) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + .include # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer Modified: head/stand/forth/Makefile ============================================================================== --- head/stand/forth/Makefile Mon Feb 26 03:05:36 2018 (r330003) +++ head/stand/forth/Makefile Mon Feb 26 03:16:04 2018 (r330004) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + .include MAN+= beastie.4th.8 \ Modified: head/stand/i386/Makefile ============================================================================== --- head/stand/i386/Makefile Mon Feb 26 03:05:36 2018 (r330003) +++ head/stand/i386/Makefile Mon Feb 26 03:16:04 2018 (r330004) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + .include SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ Modified: head/stand/mips/Makefile ============================================================================== --- head/stand/mips/Makefile Mon Feb 26 03:05:36 2018 (r330003) +++ head/stand/mips/Makefile Mon Feb 26 03:16:04 2018 (r330004) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + SUBDIR= uboot # Modified: head/stand/powerpc/Makefile ============================================================================== --- head/stand/powerpc/Makefile Mon Feb 26 03:05:36 2018 (r330003) +++ head/stand/powerpc/Makefile Mon Feb 26 03:16:04 2018 (r330004) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + .include SUBDIR= boot1.chrp ofw uboot Modified: head/stand/sparc64/Makefile ============================================================================== --- head/stand/sparc64/Makefile Mon Feb 26 03:05:36 2018 (r330003) +++ head/stand/sparc64/Makefile Mon Feb 26 03:16:04 2018 (r330004) @@ -1,5 +1,7 @@ # $FreeBSD$ +NO_OBJ=t + .include SUBDIR= boot1 loader