From 4576f811af2e29a3d26303821605c6e5479feb6d Mon Sep 17 00:00:00 2001 From: sjg Date: Tue, 4 Jun 2013 15:27:41 +0000 Subject: Ensure this makefile and anything it runs, does so without meta mode. Allows buildworld etc. --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a396fc9..b48b784 100644 --- a/Makefile +++ b/Makefile @@ -458,3 +458,11 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT + +.if defined(.PARSEDIR) +# this makefile does not run in meta mode +.MAKE.MODE= normal +# make sure things we run from here don't either +WITHOUT_META_MODE= +.export WITHOUT_META_MODE +.endif -- cgit v1.1 From 971be67d009b10527349111080c7c856b7eb2374 Mon Sep 17 00:00:00 2001 From: sjg Date: Wed, 16 Oct 2013 16:05:49 +0000 Subject: Make it possible to buildworld, while producing .meta files to aid debugging. --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6ba3b05..e9500c7 100644 --- a/Makefile +++ b/Makefile @@ -500,11 +500,19 @@ buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT .if defined(.PARSEDIR) -# this makefile does not run in meta mode +# This makefile does not run in meta mode .MAKE.MODE= normal -# make sure things we run from here don't either +# Normally the things we run from here don't either. +# Using -DWITH_META_FILES -DWITHOUT_STAGING +# we can buildworld with meta files created which are useful +# for debugging, but without any of the rest of a meta mode build. +.ifndef WITH_META_FILES WITHOUT_META_MODE= .export WITHOUT_META_MODE +.else +UPDATE_DEPENDFILE=NO +.export UPDATE_DEPENDFILE +.endif .if make(universe) # we do not want a failure of one branch abort all. -- cgit v1.1 From 437cf0a8f35c329cb48738ff026e715ec4ec0aea Mon Sep 17 00:00:00 2001 From: sjg Date: Mon, 5 May 2014 18:32:24 +0000 Subject: If building WITH_META_FILES we do not want STAGING --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cdd6b16..924ad9e 100644 --- a/Makefile +++ b/Makefile @@ -500,8 +500,9 @@ buildLINT: WITHOUT_META_MODE= .export WITHOUT_META_MODE .else +WITHOUT_STAGING= UPDATE_DEPENDFILE=NO -.export UPDATE_DEPENDFILE +.export UPDATE_DEPENDFILE WITHOUT_STAGING .endif .if make(universe) -- cgit v1.1 From d98d3ee218059dd8665b78c83501bbe8cd4e0855 Mon Sep 17 00:00:00 2001 From: sjg Date: Sun, 30 Nov 2014 18:50:15 +0000 Subject: If we are doing META_MODE use targets/Makefile as top-level since this one isn't suitable. --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3951269..d2a5f3a 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,11 @@ # # For more information, see the build(7) manual page. # +.if ${MK_META_MODE} == "yes" +# targets/Makefile plays the role of top-level +.include "targets/Makefile" +.else + TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check-old check-old-dirs check-old-files check-old-libs \ checkdpadd clean cleandepend cleandir \ @@ -527,3 +532,4 @@ MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif .endif +.endif -- cgit v1.1 From 167576cd473259db5d2c5e46606ae2965c9e55c7 Mon Sep 17 00:00:00 2001 From: sjg Date: Wed, 10 Jun 2015 13:08:45 +0000 Subject: Since sys.mk now handles META_MODE and META_FILES options we need not worry about them here. Checking for .PARSEDIR no longer needed. --- Makefile | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e0317eb..b37098e 100644 --- a/Makefile +++ b/Makefile @@ -521,26 +521,22 @@ universe_epilogue: buildLINT: ${MAKE} -C ${.CURDIR}/sys/${_TARGET}/conf LINT -.if defined(.PARSEDIR) # This makefile does not run in meta mode .MAKE.MODE= normal # Normally the things we run from here don't either. -# Using -DWITH_META_FILES -DWITHOUT_STAGING +# Using -DWITH_META_FILES # we can buildworld with meta files created which are useful # for debugging, but without any of the rest of a meta mode build. -.ifndef WITH_META_FILES -WITHOUT_META_MODE= -.export WITHOUT_META_MODE -.else -WITHOUT_STAGING= -UPDATE_DEPENDFILE=NO -.export UPDATE_DEPENDFILE WITHOUT_STAGING -.endif +MK_META_MODE= no +MK_STAGING= no +# tell meta.autodep.mk to not even think about updating anything. +UPDATE_DEPENDFILE= NO +.export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE .if make(universe) # we do not want a failure of one branch abort all. MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif -.endif -.endif + +.endif # META_MODE -- cgit v1.1 From b4fa22702548a802d8736557efeafa94d0b2a820 Mon Sep 17 00:00:00 2001 From: rodrigc Date: Sun, 14 Jun 2015 22:36:27 +0000 Subject: If MK_META_MODE is unset, assume a value of no. This is needed to build HEAD on FreeBSD 10.1, which has bmake, but does not have /usr/share/mk/src.opts.mk Reviewed by: sjg Reported by: jenkins --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b37098e..67e1084 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ # # For more information, see the build(7) manual page. # -.if ${MK_META_MODE} == "yes" +.if ${MK_META_MODE:Uno} == "yes" # targets/Makefile plays the role of top-level .include "targets/Makefile" .else -- cgit v1.1