From 29efb3dcaedd9cbabc6f96f35545baf2c8b28501 Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Thu, 23 May 2024 13:08:58 -0700 Subject: Import bmake-20240520 Intersting/relevant changes since bmake-20240508 ChangeLog since bmake-20240508 2024-05-20 Simon J Gerraty * VERSION (_MAKE_VERSION): Merge with NetBSD make, pick up o dir.c: in FindFile restore last search of .CURDIR even for includes, as a number of existing makefiles are broken otherwise. 2024-05-19 Simon J Gerraty * VERSION (_MAKE_VERSION): 20240519 Merge with NetBSD make, pick up o dir.c: Add Dir_FindInclude, FindFile without looking in .CURDIR. Also fix Dir_SetSYSPATH to use defSysIncPath if sysIncPath is empty. o main.c: no need to set .DOTLAST in sysIncPath --- parse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'parse.c') diff --git a/parse.c b/parse.c index 54f29ba5ff13..70c6d6fe5157 100644 --- a/parse.c +++ b/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.722 2024/04/27 17:33:46 rillig Exp $ */ +/* $NetBSD: parse.c,v 1.723 2024/05/19 20:09:40 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -121,7 +121,7 @@ #include "pathnames.h" /* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: parse.c,v 1.722 2024/04/27 17:33:46 rillig Exp $"); +MAKE_RCSID("$NetBSD: parse.c,v 1.723 2024/05/19 20:09:40 sjg Exp $"); /* Detects a multiple-inclusion guard in a makefile. */ typedef enum { @@ -1269,7 +1269,7 @@ IncludeFile(const char *file, bool isSystem, bool depinc, bool silent) if (fullname == NULL) { SearchPath *path = Lst_IsEmpty(&sysIncPath->dirs) ? defSysIncPath : sysIncPath; - fullname = Dir_FindFile(file, path); + fullname = Dir_FindInclude(file, path); } if (fullname == NULL) { -- cgit v1.3