[src/trunk]: src/usr.bin/make make: merge duplicate code in Arch_FindLib

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6d95a42de00d
branches:  trunk
changeset: 1018460:6d95a42de00d
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Feb 04 19:50:29 2021 +0000

description:
make: merge duplicate code in Arch_FindLib

No functional change.  Furthermore, this only affects builds that
explicitly disable LIBRARIES in config.h.

diffstat:

 usr.bin/make/arch.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ffbd9dfa133f -r 6d95a42de00d usr.bin/make/arch.c
--- a/usr.bin/make/arch.c       Thu Feb 04 19:43:00 2021 +0000
+++ b/usr.bin/make/arch.c       Thu Feb 04 19:50:29 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arch.c,v 1.194 2021/01/23 10:48:49 rillig Exp $        */
+/*     $NetBSD: arch.c,v 1.195 2021/02/04 19:50:29 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
 #include "config.h"
 
 /*     "@(#)arch.c     8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: arch.c,v 1.194 2021/01/23 10:48:49 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.195 2021/02/04 19:50:29 rillig Exp $");
 
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
@@ -975,7 +975,7 @@
 #ifdef LIBRARIES
        Var_Set(TARGET, gn->name, gn);
 #else
-       Var_Set(TARGET, gn->path == NULL ? gn->name : gn->path, gn);
+       Var_Set(TARGET, GNode_Path(gn), gn);
 #endif
 }