[Midnightbsd-cvs] src [7542] trunk/share/mk/sys.mk: fix bmake compatibility
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Apr 16 13:53:39 EDT 2016
Revision: 7542
http://svnweb.midnightbsd.org/src/?rev=7542
Author: laffer1
Date: 2016-04-16 13:50:38 -0400 (Sat, 16 Apr 2016)
Log Message:
-----------
fix bmake compatibility
Modified Paths:
--------------
trunk/share/mk/sys.mk
Modified: trunk/share/mk/sys.mk
===================================================================
--- trunk/share/mk/sys.mk 2016-04-15 01:45:29 UTC (rev 7541)
+++ trunk/share/mk/sys.mk 2016-04-16 17:50:38 UTC (rev 7542)
@@ -1,6 +1,6 @@
# from: @(#)sys.mk 8.2 (Berkeley) 3/21/94
# $FreeBSD: src/share/mk/sys.mk,v 1.86.2.1 2005/11/16 08:12:03 ru Exp $
-# $MidnightBSD: src/share/mk/sys.mk,v 1.9 2012/04/01 16:22:20 laffer1 Exp $
+# $MidnightBSD$
unix ?= We run MidnightBSD, not UNIX.
.MidnightBSD ?= true
@@ -17,6 +17,10 @@
MACHINE_CPUARCH=${MACHINE_ARCH}
.endif
+# Set any local definitions first. Place this early, but it needs
+# MACHINE_CPUARCH to be defined.
+.sinclude <local.sys.mk>
+
# If the special target .POSIX appears (without prerequisites or
# commands) before the first noncomment line in the makefile, make shall
# process the makefile as specified by the Posix 1003.2 specification.
@@ -129,6 +133,8 @@
OBJC ?= cc
OBJCFLAGS ?= ${OBJCINCLUDES} ${CFLAGS} -Wno-import
+OBJCOPY ?= objcopy
+
PC ?= pc
PFLAGS ?=
@@ -361,8 +367,22 @@
# XXX hint for bsd.port.mk
OBJFORMAT?= elf
+# Tell bmake to expand -V VAR by default
+.MAKE.EXPAND_VARIABLES= yes
+
+# Tell bmake the makefile preference
+.MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile
+
+.if !defined(.PARSEDIR)
+# We are not bmake, which is more aggressive about searching .PATH
+# It is sometime necessary to curb its enthusiasm with .NOPATH
+# The following allows us to quietly ignore .NOPATH when not using bmake.
+.NOTMAIN: .NOPATH
+.NOPATH:
+
# Toggle on warnings
.WARN: dirsyntax
+.endif
.endif
More information about the Midnightbsd-cvs
mailing list