git: ab8b2d108c7c - main - sys/conf: Remove an unneeded flag variable

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=ab8b2d108c7c4e63ed850148fdc237633077fcd3

commit ab8b2d108c7c4e63ed850148fdc237633077fcd3
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-12-14 14:32:17 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2022-12-14 14:32:17 +0000

    sys/conf: Remove an unneeded flag variable
    
    After commit fac6dee9eb58 ("Remove tests for obsolete compilers in the
    build system"), we always set -fdebug-prefix-map, so there's no point in
    defining and testing _MAP_DEBUG_PREFIX.  No functional change intended.
    
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
---
 sys/conf/kern.post.mk | 4 ----
 sys/conf/kmod.mk      | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index d08dfe30d7de..7aac581fdb0f 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -351,8 +351,6 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
 
 .depend: .PRECIOUS ${SRCS}
 
-_MAP_DEBUG_PREFIX= yes
-
 _ILINKS= machine
 .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64"
 _ILINKS+= ${MACHINE_CPUARCH}
@@ -370,13 +368,11 @@ _ILINKS+= i386
 .if !exists(${.OBJDIR}/${_link})
 ${SRCS} ${DEPENDOBJS}: ${_link}
 .endif
-.if defined(_MAP_DEBUG_PREFIX)
 .if ${_link} == "machine"
 CFLAGS+= -fdebug-prefix-map=./machine=${SYSDIR}/${MACHINE}/include
 .else
 CFLAGS+= -fdebug-prefix-map=./${_link}=${SYSDIR}/${_link}/include
 .endif
-.endif
 .endfor
 
 ${_ILINKS}:
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index ace2f4cc3d4c..89da3d4fc82e 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -281,8 +281,6 @@ ${FULLPROG}: ${OBJS} ${BLOB_OBJS}
 	${OBJCOPY} --strip-debug ${.TARGET}
 .endif
 
-_MAP_DEBUG_PREFIX= yes
-
 _ILINKS=machine
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _ILINKS+=x86
@@ -304,13 +302,11 @@ beforebuild: ${_ILINKS}
 .if !exists(${.OBJDIR}/${_link})
 OBJS_DEPEND_GUESS+=	${_link}
 .endif
-.if defined(_MAP_DEBUG_PREFIX)
 .if ${_link} == "machine"
 CFLAGS+= -fdebug-prefix-map=./machine=${SYSDIR}/${MACHINE}/include
 .else
 CFLAGS+= -fdebug-prefix-map=./${_link}=${SYSDIR}/${_link}/include
 .endif
-.endif
 .endfor
 
 .NOPATH: ${_ILINKS}