diff options
| author | Ian Lepore <ian@FreeBSD.org> | 2013-11-04 15:55:04 +0000 |
|---|---|---|
| committer | Ian Lepore <ian@FreeBSD.org> | 2013-11-04 15:55:04 +0000 |
| commit | f827d58e4d6b3bedb7ac517a36baddce01dff502 (patch) | |
| tree | 2bf231819963f4a67f8b946b158bfdd483bc0842 /sys/modules | |
| parent | 29a74096aa22de440aa70c1568d1911a18f48cc0 (diff) | |
| download | src-f827d58e4d6b3bedb7ac517a36baddce01dff502.tar.gz src-f827d58e4d6b3bedb7ac517a36baddce01dff502.zip | |
Rework the aicasm build machinery so that it gets built along with toolchain
components instead of with the kernel and/or modules. This ensures that it
gets built with the host compiler, not the compiler in obj/... used to build
the target components (which may be a cross-compiler outputting code for a
different architecture and using header files with types and options set up
for the wrong architecture).
Reviewed by: imp
Notes
Notes:
svn path=/head/; revision=257637
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/aic7xxx/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/aic7xxx/ahc/Makefile | 7 | ||||
| -rw-r--r-- | sys/modules/aic7xxx/ahd/Makefile | 7 |
3 files changed, 5 insertions, 11 deletions
diff --git a/sys/modules/aic7xxx/Makefile b/sys/modules/aic7xxx/Makefile index 47550f0de2c4..08567a624528 100644 --- a/sys/modules/aic7xxx/Makefile +++ b/sys/modules/aic7xxx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SUBDIR= aicasm ahc ahd +SUBDIR= ahc ahd .include <bsd.subdir.mk> diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile index 66780d8ccaad..b69fbaf83280 100644 --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -15,13 +15,10 @@ REG_PRINT_OPT= -p aic7xxx_reg_print.c .endif BEFORE_DEPEND = ${GENSRCS} -../aicasm/aicasm: ${.CURDIR}/../../../dev/aci7xxx/aicasm/*.[chyl] - ( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; ) - ${GENSRCS}: \ ${.CURDIR}/../../../dev/aic7xxx/aic7xxx.{reg,seq} \ - ${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm - ../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \ + ${.CURDIR}/../../../cam/scsi/scsi_message.h + aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \ -I${.CURDIR}/../../../dev/aic7xxx \ -o aic7xxx_seq.h -r aic7xxx_reg.h \ ${REG_PRINT_OPT} \ diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile index 77885c78c752..b1e790063ef3 100644 --- a/sys/modules/aic7xxx/ahd/Makefile +++ b/sys/modules/aic7xxx/ahd/Makefile @@ -15,13 +15,10 @@ REG_PRINT_OPT= -p aic79xx_reg_print.c .endif BEFORE_DEPEND= ${GENSRCS} -../aicasm/aicasm: ${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl] - ( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; ) - ${GENSRCS}: \ ${.CURDIR}/../../../dev/aic7xxx/aic79xx.{reg,seq} \ - ${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm - ../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \ + ${.CURDIR}/../../../cam/scsi/scsi_message.h + aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \ -I${.CURDIR}/../../../dev/aic7xxx \ -o aic79xx_seq.h -r aic79xx_reg.h \ ${REG_PRINT_OPT} \ |