summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason King <jason.king@joyent.com>2020-12-18 02:39:47 +0000
committerJason King <jason.king@joyent.com>2020-12-18 02:39:47 +0000
commit8da15b249773fc4ae4d24feff011a40b5f488b3a (patch)
tree8b5e0c1bfb17f80987860b56602ad96ea30f077a
parent25bf0be6ef43aa536901136692fe4be39e895e78 (diff)
downloadillumos-joyent-8da15b249773fc4ae4d24feff011a40b5f488b3a.tar.gz
13258 remove lint from the uts build [fix PCBE Makefiles]
-rw-r--r--usr/src/Makefile.psm.targ3
-rw-r--r--usr/src/uts/intel/core_pcbe/Makefile2
-rw-r--r--usr/src/uts/intel/opteron_pcbe/Makefile2
-rw-r--r--usr/src/uts/intel/p4_pcbe/Makefile2
4 files changed, 6 insertions, 3 deletions
diff --git a/usr/src/Makefile.psm.targ b/usr/src/Makefile.psm.targ
index 6de7e1ddbc..6365e9c35a 100644
--- a/usr/src/Makefile.psm.targ
+++ b/usr/src/Makefile.psm.targ
@@ -49,6 +49,9 @@ $(ROOT_PSM_MOD_DIR): $(ROOT_PSM_DIR)
$(ROOT_PSM_MOD_DIRS_32): $(ROOT_PSM_MOD_DIR)
-$(INS.dir)
+$(ROOT_PSM_PCBE_DIR): $(ROOT_PSM_MOD_DIR)
+ -$(INS.dir)
+
$(ROOT_PSM_DIR)/%: % $(ROOT_PSM_DIR)
$(INS.file)
diff --git a/usr/src/uts/intel/core_pcbe/Makefile b/usr/src/uts/intel/core_pcbe/Makefile
index aa67170575..c6e1008ced 100644
--- a/usr/src/uts/intel/core_pcbe/Makefile
+++ b/usr/src/uts/intel/core_pcbe/Makefile
@@ -66,7 +66,7 @@ CPCGEN_SRCS = $(CPCGEN_OBJS:%.o=%.c) core_pcbe_cpcgen.h
MODULE = pcbe.GenuineIntel.6.15
OBJECTS = $(CORE_PCBE_OBJS:%=$(OBJS_DIR)/%)
OBJECTS += $(CPCGEN_OBJS:%=$(OBJS_DIR)/%)
-ROOTMODULE = $(USR_PCBE_DIR)/$(MODULE)
+ROOTMODULE = $(ROOT_PSM_PCBE_DIR)/$(MODULE)
#
# This order matches the families declared in uts/intel/sys/x86_archext.h.
diff --git a/usr/src/uts/intel/opteron_pcbe/Makefile b/usr/src/uts/intel/opteron_pcbe/Makefile
index 8051f317ee..74d6e26c5f 100644
--- a/usr/src/uts/intel/opteron_pcbe/Makefile
+++ b/usr/src/uts/intel/opteron_pcbe/Makefile
@@ -47,7 +47,7 @@ CPCGEN_SRCS = $(CPCGEN_OBJS:%.o=%.c) opteron_pcbe_cpcgen.h
MODULE = pcbe.AuthenticAMD
OBJECTS = $(OPTERON_PCBE_OBJS:%=$(OBJS_DIR)/%)
OBJECTS += $(CPCGEN_OBJS:%=$(OBJS_DIR)/%)
-ROOTMODULE = $(USR_PCBE_DIR)/$(MODULE)
+ROOTMODULE = $(ROOT_PSM_PCBE_DIR)/$(MODULE)
#
# Include common rules.
diff --git a/usr/src/uts/intel/p4_pcbe/Makefile b/usr/src/uts/intel/p4_pcbe/Makefile
index d7f594ed3f..730c3c4b07 100644
--- a/usr/src/uts/intel/p4_pcbe/Makefile
+++ b/usr/src/uts/intel/p4_pcbe/Makefile
@@ -34,7 +34,7 @@ UTSBASE = ../..
#
MODULE = pcbe.GenuineIntel.15
OBJECTS = $(P4_PCBE_OBJS:%=$(OBJS_DIR)/%)
-ROOTMODULE = $(USR_PCBE_DIR)/$(MODULE)
+ROOTMODULE = $(ROOT_PSM_PCBE_DIR)/$(MODULE)
#
# Include common rules.