Tue Mar 13 08:53:06 2018 UTC ()
Revert the COMPAT_AS sestting back to library, the documented default.

It doesn't really matter, since we no longer build the library in any
format, but best to make the code match the comments.


(pgoyette)
diff -r1.23 -r1.23.2.1 src/sys/compat/common/Makefile.inc
cvs diff -r1.23 -r1.23.2.1 src/sys/compat/common/Attic/Makefile.inc (expand / switch to unified diff)

--- src/sys/compat/common/Attic/Makefile.inc 2017/12/16 08:31:36 1.23
+++ src/sys/compat/common/Attic/Makefile.inc 2018/03/13 08:53:06 1.23.2.1
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile.inc,v 1.23 2017/12/16 08:31:36 maxv Exp $ 1# $NetBSD: Makefile.inc,v 1.23.2.1 2018/03/13 08:53:06 pgoyette Exp $
2# 2#
3# Configuration variables (default values are below): 3# Configuration variables (default values are below):
4# 4#
5# S must be set to the top of the 'sys' tree. 5# S must be set to the top of the 'sys' tree.
6# COMPATDST 6# COMPATDST
7# may be set to the location of the directory where library 7# may be set to the location of the directory where library
8# objects are to be built. Defaults to ${.OBJDIR}/lib/compat. 8# objects are to be built. Defaults to ${.OBJDIR}/lib/compat.
9# COMPAT_AS 9# COMPAT_AS
10# may be set to 'obj' to build a object from the library's 10# may be set to 'obj' to build a object from the library's
11# object files. (Otherwise, a library will be built.) 11# object files. (Otherwise, a library will be built.)
12# Defaults to 'library'. 12# Defaults to 'library'.
13# COMPATMISCMAKEFLAGS 13# COMPATMISCMAKEFLAGS
14# Miscellaneous flags to be passed to the library's Makefile when 14# Miscellaneous flags to be passed to the library's Makefile when
15# building. See library's Makefile for more details about 15# building. See library's Makefile for more details about
16# supported flags and their default values. 16# supported flags and their default values.
17 17
18# Default values: 18# Default values:
19COMPATDST?= ${.OBJDIR}/lib/compat 19COMPATDST?= ${.OBJDIR}/lib/compat
20COMPAT_AS?= obj 20COMPAT_AS?= obj
21COMPATDOTDIR?= ../../. 21COMPATDOTDIR?= ../../.
22 22
23COMPATDIR= ${S:S@^.@${COMPATDOTDIR}@:Q}/compat/common 23COMPATDIR= ${S:S@^.@${COMPATDOTDIR}@:Q}/compat/common
24.if (${COMPAT_AS} == "obj") 24.if (${COMPAT_AS} == "library")
25COMPATLIB= ${COMPATDST}/libcompat.o 25COMPATLIB= ${COMPATDST}/libcompat.o
26COMPATLIB_PROF= ${COMPATDST}/libcompat.po 26COMPATLIB_PROF= ${COMPATDST}/libcompat.po
27.else 27.else
28COMPATLIB= ${COMPATDST}/libcompat.a 28COMPATLIB= ${COMPATDST}/libcompat.a
29COMPATLIB_PROF= ${COMPATDST}/libcompat_p.a 29COMPATLIB_PROF= ${COMPATDST}/libcompat_p.a
30.endif 30.endif
31 31
32LIBCOMPATLNBN= llib-lcompat.ln 32LIBCOMPATLNBN= llib-lcompat.ln
33COMPATLIBLN= ${COMPATDST}/${LIBCOMPATLNBN} 33COMPATLIBLN= ${COMPATDST}/${LIBCOMPATLNBN}
34 34
35COMPATMAKE= \ 35COMPATMAKE= \
36 cd ${COMPATDST} && ${MAKE} -f ${COMPATDIR:Q}/Makefile \ 36 cd ${COMPATDST} && ${MAKE} -f ${COMPATDIR:Q}/Makefile \
37 COMPATDIR=${COMPATDIR:Q} \ 37 COMPATDIR=${COMPATDIR:Q} \