[DTrace-devel] [PATCH v3 6/9] build: force regeneration of config.{h, mk} when configure options change

Kris Van Hees kvanhees at kvh-deb-bpf.us.oracle.com
Tue Jan 30 17:00:48 UTC 2024


On Fri, Jan 26, 2024 at 01:58:46PM +0000, Nick Alcock wrote:
> Now that we are actually rerunning configure tests only when needed, we need
> to force regeneration of config.h more reliably (we can't depend on the
> stamp file to do it for us, since that is now updated only when the
> directory as a whole is deleted).  Just have the individual configure tests
> delete the generated accumulated config files, forcing regeneration with the
> new content produced by that rule.
> 
> Signed-off-by: Nick Alcock <nick.alcock at oracle.com>

Reviewed-by: Kris Van Hees <kris.van.hees at oracle.com>

> ---
>  Makeconfig | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Makeconfig b/Makeconfig
> index cb6f16e64e98..1e031ada9801 100644
> --- a/Makeconfig
> +++ b/Makeconfig
> @@ -57,6 +57,8 @@ $(objdir)/.config/config.$(1).h $(objdir)/.config/config.$(1).mk: $(objdir)/.con
>  	*) echo "HAVE_$(1) must be yes or no, not $(HAVE_$(1))" >&2; \
>  	   false;; \
>  	esac
> +	rm -f $(CONFIG_H)
> +	rm -f $(CONFIG_MK)
>  
>  $(eval $(call make-override-help,HAVE_$(1), presence of $(2) in $(3).h))
>  
> @@ -91,6 +93,8 @@ $(objdir)/.config/config.$(1).h $(objdir)/.config/config.$(1).mk: $(objdir)/.con
>  	*) echo "HAVE_$(1) must be yes or no, not $(HAVE_$(1))" >&2; \
>  	   false;; \
>  	esac
> +	rm -f $(CONFIG_H)
> +	rm -f $(CONFIG_MK)
>  
>  $(eval $(call make-override-help,HAVE_$(1), presence of $(2) in lib$(3)))
>  
> @@ -124,6 +128,8 @@ $(objdir)/.config/config.$(1).h $(objdir)/.config/config.$(1).mk: $(objdir)/.con
>  	*) echo "HAVE_$(1) must be yes or no, not $(HAVE_$(1))" >&2; \
>  	   false;; \
>  	esac
> +	rm -f $(CONFIG_H)
> +	rm -f $(CONFIG_MK)
>  
>  $(eval $(call make-override-help,HAVE_$(1), presence of $(2) in lib$(3) and $(4).h))
>  
> -- 
> 2.43.0.272.gce700b77fd
> 
> 



More information about the DTrace-devel mailing list