summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Ross <gordon.w.ross@gmail.com>2016-10-25 16:17:09 -0400
committerGordon Ross <gwr@nexenta.com>2016-10-25 17:04:48 -0400
commit0543bac1853a7ceaa62e75597e453eb7cf895599 (patch)
tree1e11f34752fabf396858efd0a44ebdf98c8ba12b
parente407c527e1514e6fd27456153e205531cd17d60c (diff)
downloadillumos-gfx-drm-0543bac1853a7ceaa62e75597e453eb7cf895599.tar.gz
Allow make lint
-rw-r--r--myenv.sh1
-rw-r--r--usr/src/uts/intel/Makefile2
-rw-r--r--usr/src/uts/intel/Makefile.intel11
-rw-r--r--usr/src/uts/sparc/Makefile2
-rw-r--r--usr/src/uts/sparc/Makefile.sparc19
5 files changed, 7 insertions, 28 deletions
diff --git a/myenv.sh b/myenv.sh
index 0cefa5f..ad05287 100644
--- a/myenv.sh
+++ b/myenv.sh
@@ -70,6 +70,7 @@ export PKGFMT_OUTPUT='v1'
export CW_NO_SHADOW='1'
# Build tools - don't change these unless you know what you're doing.
+export BUILD_TOOLS=/opt
export ONBLD_TOOLS=/opt/onbld
# see usr/src/pkg
diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile
index 8ddcc8d..45665fa 100644
--- a/usr/src/uts/intel/Makefile
+++ b/usr/src/uts/intel/Makefile
@@ -74,7 +74,7 @@ install_h check: FRC
#
# Full kernel lint target.
#
-LINT_TARGET = globallint
+LINT_TARGET = # globallint
globallint:
@pwd
diff --git a/usr/src/uts/intel/Makefile.intel b/usr/src/uts/intel/Makefile.intel
index bae3ea1..a77fbc6 100644
--- a/usr/src/uts/intel/Makefile.intel
+++ b/usr/src/uts/intel/Makefile.intel
@@ -56,8 +56,8 @@ LINT_LIB_DIR = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)
UNIX_O = $(UNIX_DIR)/$(OBJS_DIR)/unix.o
GENLIB = $(GENLIB_DIR)/$(OBJS_DIR)/libgenunix.so
MODSTUBS_O = $(MODSTUBS_DIR)/$(OBJS_DIR)/modstubs.o
-LINT_LIB = $(UTSBASE)/i86pc/lint-libs/$(OBJS_DIR)/llib-lunix.ln
-GEN_LINT_LIB = $(UTSBASE)/intel/lint-libs/$(OBJS_DIR)/llib-lgenunix.ln
+LINT_LIB = # was llib-lunix.ln
+GEN_LINT_LIB = # was llib-lgenunix.ln
#
# Include the makefiles which define build rule templates, the
@@ -271,10 +271,3 @@ KICONV_KMODS +=
# 'Dacf' Modules (/kernel/dacf):
#
DACF_KMODS +=
-
-#
-# Ensure that the variable member of the cpu_t (cpu_m) is defined
-# for the lint builds so as not to cause lint errors during the
-# global cross check.
-#
-LINTFLAGS += -D_MACHDEP -I$(UTSBASE)/i86pc
diff --git a/usr/src/uts/sparc/Makefile b/usr/src/uts/sparc/Makefile
index 4620b88..502f257 100644
--- a/usr/src/uts/sparc/Makefile
+++ b/usr/src/uts/sparc/Makefile
@@ -78,7 +78,7 @@ install_h check: FRC
#
# Full kernel lint target.
#
-LINT_TARGET = globallint
+LINT_TARGET = # globallint
globallint:
@pwd
diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc
index b386881..990ccea 100644
--- a/usr/src/uts/sparc/Makefile.sparc
+++ b/usr/src/uts/sparc/Makefile.sparc
@@ -56,14 +56,8 @@ UNIX_O = $(UNIX_DIR)/$(OBJS_DIR)/unix.o
MODSTUBS_O = $(MODSTUBS_DIR)/$(OBJS_DIR)/modstubs.o
GENLIB = $(UTSBASE)/sun4u/lint-libs/$(OBJS_DIR)/libgenunix.so
-LINT_LIB_32 = $(UTSBASE)/sun4u/lint-libs/$(OBJS_DIR)/llib-lunix.ln
-GEN_LINT_LIB_32 = $(UTSBASE)/sun4u/lint-libs/$(OBJS_DIR)/llib-lgenunix.ln
-
-LINT_LIB_64 = $(UTSBASE)/sun4u/lint-libs/$(OBJS_DIR)/llib-lunix.ln
-GEN_LINT_LIB_64 = $(UTSBASE)/sun4u/lint-libs/$(OBJS_DIR)/llib-lgenunix.ln
-
-LINT_LIB = $(LINT_LIB_$(CLASS))
-GEN_LINT_LIB = $(GEN_LINT_LIB_$(CLASS))
+LINT_LIB = # was llib-lunix.ln
+GEN_LINT_LIB = # was llib-lgenunix.ln
LINT32_DIRS = $(LINT32_BUILDS:%=$(UTSBASE)/sparc/lint-libs/%)
LINT32_FILES = $(LINT32_DIRS:%=%/llib-l$(MODULE).ln)
@@ -278,12 +272,3 @@ SOCKET_KMODS +=
# kiconv modules (/kernel/kiconv):
#
KICONV_KMODS +=
-
-
-#
-# Ensure that the variable member of the cpu_t (cpu_m) is defined
-# for the lint builds so as not to cause lint errors during the
-# global cross check.
-#
-$(LINTFLAGSUPPRESS)LINTFLAGS += -D_MACHDEP -I$(UTSBASE)/sun4 \
- -I$(UTSBASE)/sun4u -I$(UTSBASE)/sfmmu