From 974996d4b915760f1e3b6ec4ed8ed8e96628b940 Mon Sep 17 00:00:00 2001
From: scottl <scottl@FreeBSD.org>
Date: Sun, 3 Nov 2002 23:48:14 +0000
Subject: Hook the aic7xxx modules up.  This requires some extra care since
 aicasm is a compiler tool and needs to be compiled by the host compiler. 
 I've tested this in i386->sparc cross-build, 4.7->current upgrade, normal
 buildkernel target, and normal /sys/i386/compile/GENERIC configurations.

Submitted by:	ru
---
 Makefile.inc1 | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index a72e529..7074d05 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -492,12 +492,21 @@ buildkernel:
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \
 	    ${MAKE} -DNO_CPU_CFLAGS -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile
+.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules)
+	cd ${KRNLOBJDIR}/${_kernel}; \
+	    ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} modules-obj
+	cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \
+	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
+	    ${MAKE} -DNO_CPU_CFLAGS depend; \
+	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
+	    ${MAKE} -DNO_CPU_CFLAGS all
+.endif
 .if !defined(NO_KERNELDEPEND)
 	cd ${KRNLOBJDIR}/${_kernel}; \
-	    ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend
+	    ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
-	    ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all
+	    ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
@@ -608,6 +617,10 @@ bootstrap-tools:
 #
 # build-tools: Build special purpose build tools
 #
+.if defined(MODULES_WITH_WORLD) && exists(${KRNLSRCDIR}/modules)
+_aicasm= sys/modules/aic7xxx/aicasm
+.endif
+
 .if exists(${.CURDIR}/share) && !defined(NOSHARE)
 _share=	share/syscons/scrnmaps
 .endif
@@ -630,7 +643,7 @@ _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
 build-tools:
 .for _tool in bin/csh bin/sh gnu/usr.bin/cc/cc_tools ${_fortran} \
     ${_libroken4} ${_libkrb5} lib/libncurses ${_share} \
-    usr.bin/awk usr.bin/file usr.sbin/sysinstall
+    ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall
 	${ECHODIR} "===> ${_tool}"; \
 		cd ${.CURDIR}/${_tool}; ${MAKE} DIRPRFX=${_tool}/ build-tools
 .endfor
-- 
cgit v1.1