d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make lint(1) a cross-tool.

Browse Source 
(See commit log for usr.bin/xlint/Makefile,v 1.11 for what was wrong
with enabling build of lint libraries in rev. 1.12.)

This fixes cross-arch compiles (running binaries for a different arch
when generating lint.7 and lint libraries) and cross-branch compiles
(4.x -> 5.0 buildworld should be working again).
This commit is contained in:
Ruslan Ermilov 2002-03-20 18:25:50 +00:00
parent 51dbee9db1
commit bd42830f0f
8 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -615,9 +615,11 @@ _elf2exe= usr.sbin/elf2exe
_btxld= usr.sbin/btxld
.endif
_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint
cross-tools:
.for _tool in ${_btxld} ${_elf2exe} \
gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc
gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc ${_xlint}
cd ${.CURDIR}/${_tool}; \
${MAKE} obj; \
${MAKE} depend; \

2
share/mk/sys.mk
View File

@ -76,7 +76,7 @@ LD ?= ld
LDFLAGS ?=
LINT ?= lint
LINTFLAGS ?= -cghapbx -L /usr/libdata/lint
LINTFLAGS ?= -cghapbx
LINTKERNFLAGS ?= ${LINTFLAGS}
LINTOBJFLAGS ?= -cghapbxu -i
LINTLIBFLAGS ?= -cghapbxu -C ${LIB}

2
usr.bin/xlint/Makefile
View File

@ -3,6 +3,4 @@
SUBDIR= lint1 lint2 xlint llib
build-tools: lint1 lint2 xlint
.include <bsd.subdir.mk>

3
usr.bin/xlint/Makefile.inc
View File

@ -6,7 +6,8 @@ WARNS= 0
.PATH: ${.CURDIR}/../common
CFLAGS+= -I${.CURDIR}/../arch/${MACHINE_ARCH}
TARGET_ARCH?= ${MACHINE_ARCH}
CFLAGS+= -I${.CURDIR}/../arch/${TARGET_ARCH}
CFLAGS+= -I${.CURDIR}/../common
OBJECT_FMT= ELF

10
usr.bin/xlint/lint1/Makefile
View File

@ -5,6 +5,7 @@ PROG= lint1
SRCS= cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
init.c emit.c emit1.c inittyp.c
MAN= lint.7
CLEANFILES= lint.7
LDADD+= -ll -lm
DPADD+= ${LIBL} ${LIBM}
@ -12,10 +13,11 @@ CFLAGS+= -I. -I${.CURDIR}
LINTFLAGS=-aehpz
BINDIR= /usr/libexec
OBJFORMAT_PATH?= ${BINDIR} # src/Makefile.inc1 sets this
.include <bsd.prog.mk>
.PATH: ../common
.PATH: ${.CURDIR}/../common
lint.7: makeman
sh ${.CURDIR}/makeman ${.OBJDIR}/${PROG} -m >${.TARGET}
sh ${.CURDIR}/makeman ${OBJFORMAT_PATH}/${PROG} -m >${.TARGET}
.include <bsd.prog.mk>

7
usr.bin/xlint/llib/Makefile
View File

@ -1,18 +1,11 @@
# $NetBSD: Makefile,v 1.7 2000/06/14 20:22:19 matt Exp $
# $FreeBSD$
.include <bsd.own.mk>
LIBS= llib-lposix.ln llib-lstdc.ln
LINT= ${.OBJDIR}/../xlint/xlint
FILES= ${LIBS}
FILESDIR= ${LINTLIBDIR}
install:
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${LIBMODE} \
${LIBS} ${DESTDIR}${LINTLIBDIR}
CLEANFILES+= ${LIBS}
llib-lposix.ln: llib-lposix

1
usr.bin/xlint/xlint/Makefile
View File

@ -9,6 +9,7 @@ SRCS= xlint.c mem.c
MAN= lint.1
CFLAGS+=-I${.CURDIR}/../lint1
CFLAGS+= -DPREFIX=\"${TOOLS_PREFIX}\"
.include "${.CURDIR}/../../Makefile.inc"
.include <bsd.prog.mk>

9
usr.bin/xlint/xlint/pathnames.h
View File

@ -35,14 +35,11 @@
/* directory where lint1 and lint2 reside */
#ifndef PATH_LIBEXEC
#define PATH_LIBEXEC "/usr/libexec"
#define PATH_LIBEXEC PREFIX"/usr/libexec"
#endif
/* directory where cc(1) resides */
#define PATH_USRBIN "/usr/bin"
/* directory where cc(1) resides */
#define PATH_USRBIN "/usr/bin"
#define PATH_USRBIN PREFIX"/usr/bin"
/* default library search path */
#define PATH_LINTLIB "/usr/libdata/lint"
#define PATH_LINTLIB PREFIX"/usr/libdata/lint"