Build aicasm as host program, not via world's compiler.
authorJoerg Sonnenberger <joerg@dragonflybsd.org>
Thu, 21 Apr 2005 14:43:58 +0000 (14:43 +0000)
committerJoerg Sonnenberger <joerg@dragonflybsd.org>
Thu, 21 Apr 2005 14:43:58 +0000 (14:43 +0000)
sys/conf/files
sys/dev/disk/aic7xxx/ahc/Makefile
sys/dev/disk/aic7xxx/ahd/Makefile
sys/dev/disk/aic7xxx/aicasm/Makefile
sys/dev/disk/aic7xxx/aicasm/Makefile.module

index e71048a..070d200 100644 (file)
@@ -1,33 +1,33 @@
 # $FreeBSD: src/sys/conf/files,v 1.340.2.137 2003/06/04 17:10:30 sam Exp $
-# $DragonFly: src/sys/conf/files,v 1.88 2005/04/02 20:00:40 joerg Exp $
+# $DragonFly: src/sys/conf/files,v 1.89 2005/04/21 14:43:58 joerg Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
-aicasm                         optional ahc                               \
+aicasm.nx                      optional ahc                               \
        dependency      "$S/dev/disk/aic7xxx/aicasm/*.[chyl]"              \
        compile-with    "${MAKE} -f $S/dev/disk/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/disk/aic7xxx/aicasm" \
        no-obj no-implicit-rule                                            \
        clean           "aicasm* y.tab.h"
-aicasm                         optional ahd                               \
+aicasm.nx                      optional ahd                               \
        dependency      "$S/dev/disk/aic7xxx/aicasm/*.[chyl]"              \
        compile-with    "${MAKE} -f $S/dev/disk/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/disk/aic7xxx/aicasm" \
        no-obj no-implicit-rule                                            \
        clean           "aicasm* y.tab.h"
 aic7xxx_{seq.h,reg.h,reg_print.c}      optional ahc                       \
-       compile-with    "./aicasm ${INCLUDES} -I$S/bus/cam/scsi -I$S/dev/disk/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/disk/aic7xxx/aic7xxx_osm.h $S/dev/disk/aic7xxx/aic7xxx.seq"   \
+       compile-with    "./aicasm.nx ${INCLUDES} -I$S/bus/cam/scsi -I$S/dev/disk/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/disk/aic7xxx/aic7xxx_osm.h $S/dev/disk/aic7xxx/aic7xxx.seq"   \
        no-obj no-implicit-rule before-depend                              \
        clean           "aic7xxx_seq.h aic7xxx_reg.h aic7xxx_reg_print.c"  \
-       dependency      "$S/dev/disk/aic7xxx/aic7xxx.{reg,seq} $S/bus/cam/scsi/scsi_message.h aicasm"
+       dependency      "$S/dev/disk/aic7xxx/aic7xxx.{reg,seq} $S/bus/cam/scsi/scsi_message.h aicasm.nx"
 aic7xxx_reg_print.o            optional ahc ahc_reg_pretty_print       \
        compile-with    "${NORMAL_C}"                                   \
        no-implicit-rule local
 aic79xx_{seq.h,reg.h,reg_print.c}      optional ahd pci                   \
-       compile-with    "./aicasm ${INCLUDES} -I$S/bus/cam/scsi -I$S/dev/disk/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/disk/aic7xxx/aic79xx_osm.h $S/dev/disk/aic7xxx/aic79xx.seq"   \
+       compile-with    "./aicasm.nx ${INCLUDES} -I$S/bus/cam/scsi -I$S/dev/disk/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/disk/aic7xxx/aic79xx_osm.h $S/dev/disk/aic7xxx/aic79xx.seq"   \
        no-obj no-implicit-rule before-depend                              \
        clean           "aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c"  \
-       dependency      "$S/dev/disk/aic7xxx/aic79xx.{reg,seq} $S/bus/cam/scsi/scsi_message.h aicasm"
+       dependency      "$S/dev/disk/aic7xxx/aic79xx.{reg,seq} $S/bus/cam/scsi/scsi_message.h aicasm.nx"
 aic79xx_reg_print.o            optional ahd pci ahd_reg_pretty_print   \
        compile-with    "${NORMAL_C}"                                   \
        no-implicit-rule local
index 8c6da36..26beb1a 100644 (file)
@@ -1,6 +1,6 @@
 
 # $FreeBSD: src/sys/modules/aic7xxx/ahc/Makefile,v 1.2.2.1 2002/09/02 05:47:44 scottl Exp $
-# $DragonFly: src/sys/dev/disk/aic7xxx/ahc/Makefile,v 1.4 2005/02/18 11:41:42 corecode Exp $
+# $DragonFly: src/sys/dev/disk/aic7xxx/ahc/Makefile,v 1.5 2005/04/21 14:43:58 joerg Exp $
 
 .PATH: ${.CURDIR}/..
 KMOD=  ahc
@@ -8,13 +8,13 @@ SUBDIR=       ahc_eisa ahc_pci
 
 BEFORE_DEPEND= aic7xxx_{seq,reg}.h
 
-../aicasm/aicasm:
-       ( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
+../aicasm/aicasm.nx:
+       ( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm.nx; )
 
 aic7xxx_{seq.h,reg.h,reg_print.c}:                                     \
                ${.CURDIR}/../aic7xxx.{reg,seq} \
-               ${.CURDIR}/../../../../bus/cam/scsi/scsi_message.h ../aicasm/aicasm
-       ${.OBJDIR}/../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../../bus/cam/scsi \
+               ${.CURDIR}/../../../../bus/cam/scsi/scsi_message.h ../aicasm/aicasm.nx
+       ${.OBJDIR}/../aicasm/aicasm.nx ${INCLUDES} -I${.CURDIR}/../../../../bus/cam/scsi \
                        -I${.CURDIR}/..                                  \
                        -o aic7xxx_seq.h -r aic7xxx_reg.h                \
                        -p aic7xxx_reg_print.c                           \
index 577d994..c1db155 100644 (file)
@@ -1,19 +1,19 @@
 
 # $FreeBSD: src/sys/modules/aic7xxx/ahd/Makefile,v 1.2.2.1 2002/09/02 05:47:45 scottl Exp $
-# $DragonFly: src/sys/dev/disk/aic7xxx/ahd/Makefile,v 1.3 2003/08/15 08:32:28 dillon Exp $
+# $DragonFly: src/sys/dev/disk/aic7xxx/ahd/Makefile,v 1.4 2005/04/21 14:43:58 joerg Exp $
 
 .PATH: ${.CURDIR}/..
 KMOD=  ahd
 
 BEFORE_DEPEND= aic79xx_{seq,reg}.h
 
-../aicasm/aicasm:
-       ( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
+../aicasm/aicasm.nx:
+       ( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm.nx; )
 
 aic79xx_{seq.h,reg.h,reg_print.c}:                                     \
                ${.CURDIR}/../aic79xx.{reg,seq} \
-               ${.CURDIR}/../../../../bus/cam/scsi/scsi_message.h ../aicasm/aicasm
-       ${.OBJDIR}/../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../../bus/cam/scsi \
+               ${.CURDIR}/../../../../bus/cam/scsi/scsi_message.h ../aicasm/aicasm.nx
+       ${.OBJDIR}/../aicasm/aicasm.nx ${INCLUDES} -I${.CURDIR}/../../../../bus/cam/scsi \
                        -I${.CURDIR}/..          \
                        -o aic79xx_seq.h -r aic79xx_reg.h                \
                        -p aic79xx_reg_print.c                           \
index aea0e9e..091d2a7 100644 (file)
@@ -1,7 +1,7 @@
 # $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aicasm/Makefile#2 $
 #
 # $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.8.2.5 2002/09/27 15:46:28 gibbs Exp $
-# $DragonFly: src/sys/dev/disk/aic7xxx/aicasm/Makefile,v 1.4 2003/11/14 22:58:31 dillon Exp $
+# $DragonFly: src/sys/dev/disk/aic7xxx/aicasm/Makefile,v 1.5 2005/04/21 14:43:58 joerg Exp $
 
 PROG=  aicasm
 
@@ -41,4 +41,4 @@ LFLAGS+= -d
 #
 install:
 
-.include <bsd.prog.mk>
+.include <bsd.hostprog.mk>
index 83a362b..c6faf9e 100644 (file)
@@ -1,10 +1,10 @@
 
 # $FreeBSD: src/sys/modules/aic7xxx/aicasm/Makefile,v 1.4.2.1 2002/09/02 05:47:45 scottl Exp $
-# $DragonFly: src/sys/dev/disk/aic7xxx/aicasm/Makefile.module,v 1.2 2003/06/17 04:28:43 dillon Exp $
+# $DragonFly: src/sys/dev/disk/aic7xxx/aicasm/Makefile.module,v 1.3 2005/04/21 14:43:58 joerg Exp $
 
-all: aicasm
+all: aicasm.nx
 
-aicasm:        ${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl]
+aicasm.nx:     ${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl]
        ${MAKE} -f ${.CURDIR}/../../../dev/aic7xxx/aicasm/Makefile \
        MAKESRCPATH=${.CURDIR}/../../../dev/aic7xxx/aicasm