diff options
| author | gjb <gjb@FreeBSD.org> | 2013-11-06 04:38:49 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-11-06 04:38:49 +0000 |
| commit | 401ebaa81f1d0768101bcb275a9877426bb4778d (patch) | |
| tree | 832208d091d4013fc4492d491449129b277a193e /Makefile.inc1 | |
| parent | 4a3ed8452f538fa69f9a283129feb0436d0ede0b (diff) | |
| download | FreeBSD-src-401ebaa81f1d0768101bcb275a9877426bb4778d.zip FreeBSD-src-401ebaa81f1d0768101bcb275a9877426bb4778d.tar.gz | |
Revert r257730:
Make head/ buildable again, instead of spewing garbage like:
/src/gnu/lib/csu/../../../contrib/gcc/config/rs6000/crtsavres.asm:280:
Error: no such instruction: `lwz 28,-16(11)'
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b3cbdf6..cecc99c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -439,16 +439,6 @@ IMAKE_MTREE= MTREE_CMD="nmtree ${MTREEFLAGS}" KMAKEENV= ${WMAKEENV} KMAKE= ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME} -# kernel build-tools stage -KTMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ - ${WMAKEENV} ${MAKE} -f Makefile.inc1 \ - TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - DESTDIR= \ - BOOTSTRAPPING=${OSRELDATE} \ - SSP_CFLAGS= \ - -DNO_LINT \ - -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD - # # buildworld # @@ -1029,7 +1019,7 @@ buildkernel: @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools + @# Currently no special kernel tools to build. .if !defined(NO_KERNELDEPEND) @echo @echo "--------------------------------------------------------------" @@ -1357,23 +1347,6 @@ build-tools: .MAKE .endfor # -# kernel-tools: Build kernel-building tools -# -kernel-tools: .MAKE - mkdir -p ${WORLDTMP}/usr - mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ - -p ${WORLDTMP}/usr >/dev/null -.for _tool in \ - sys/dev/aic7xxx/aicasm - ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool} && \ - ${MAKE} DIRPRFX=${_tool}/ obj && \ - ${MAKE} DIRPRFX=${_tool}/ depend && \ - ${MAKE} DIRPRFX=${_tool}/ all && \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP} install -.endfor - -# # cross-tools: Build cross-building tools # .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035 @@ -1420,6 +1393,7 @@ cross-tools: .MAKE ${_btxld} \ ${_crunchide} \ ${_kgzip} \ + sys/dev/aic7xxx/aicasm ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ |
