diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2024-05-23 20:08:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2024-05-23 20:08:58 +0000 |
| commit | 29efb3dcaedd9cbabc6f96f35545baf2c8b28501 (patch) | |
| tree | 2b45a304cdbcc1659e0708535be5d004f31281c5 /parse.c | |
| parent | 3c2ab5fddc576e58f3ffa70dc5fa95144646a513 (diff) | |
Import bmake-20240520vendor/NetBSD/bmake/20240520
Intersting/relevant changes since bmake-20240508
ChangeLog since bmake-20240508
2024-05-20 Simon J Gerraty <sjg@beast.crufty.net>
* 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 <sjg@beast.crufty.net>
* 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
Diffstat (limited to 'parse.c')
| -rw-r--r-- | parse.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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) { |