diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2024-03-14 04:54:47 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2024-03-14 04:56:57 +0000 |
| commit | c59c3bf34db360695f07735bebc76a768cac5afc (patch) | |
| tree | 3413cf2c3efcfaecf20301f1309a875c732c3757 /contrib/bmake/suff.c | |
| parent | ab8f59ceaf7028d4e420820deeac180b4f743524 (diff) | |
| parent | 368b06ce6b0135d6de13f7265f6dcbaeb791b3bb (diff) | |
| download | src-c59c3bf34db360695f07735bebc76a768cac5afc.tar.gz src-c59c3bf34db360695f07735bebc76a768cac5afc.zip | |
Merge bmake-20240309
Merge commit '368b06ce6b0135d6de13f7265f6dcbaeb791b3bb'
Diffstat (limited to 'contrib/bmake/suff.c')
| -rw-r--r-- | contrib/bmake/suff.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/bmake/suff.c b/contrib/bmake/suff.c index e5f6ee83e86a..de00cc4e8581 100644 --- a/contrib/bmake/suff.c +++ b/contrib/bmake/suff.c @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.377 2024/01/05 23:22:06 rillig Exp $ */ +/* $NetBSD: suff.c,v 1.378 2024/02/07 06:43:02 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -115,7 +115,7 @@ #include "dir.h" /* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */ -MAKE_RCSID("$NetBSD: suff.c,v 1.377 2024/01/05 23:22:06 rillig Exp $"); +MAKE_RCSID("$NetBSD: suff.c,v 1.378 2024/02/07 06:43:02 rillig Exp $"); typedef List SuffixList; typedef ListNode SuffixListNode; @@ -856,15 +856,11 @@ Suff_ExtendPaths(void) for (ln = sufflist.first; ln != NULL; ln = ln->next) { Suffix *suff = ln->datum; if (!Lst_IsEmpty(&suff->searchPath->dirs)) { -#ifdef INCLUDES if (suff->include) SearchPath_AddAll(includesPath, suff->searchPath); -#endif -#ifdef LIBRARIES if (suff->library) SearchPath_AddAll(libsPath, suff->searchPath); -#endif SearchPath_AddAll(suff->searchPath, &dirSearchPath); } else { SearchPath_Free(suff->searchPath); |