diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2002-09-17 01:49:00 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2002-09-17 01:49:00 +0000 |
| commit | 66422f5b7a1a6055f0b2358268eb902aab6e2e3e (patch) | |
| tree | 7d8147c99f6bfb34b7cb47ad46e24a4f7dc93102 /Makefile.inc1 | |
| parent | 4e6ef0845de37f8c4a29410d48d3847da78a9c9f (diff) | |
| download | src-66422f5b7a1a6055f0b2358268eb902aab6e2e3e.tar.gz src-66422f5b7a1a6055f0b2358268eb902aab6e2e3e.zip | |
Initiate deorbit burn for the i386-only a.out related support. Moves are
under way to move the remnants of the a.out toolchain to ports. As the
comment in src/Makefile said, this stuff is deprecated and one should not
expect this to remain beyond 4.0-REL. It has already lasted WAY beyond
that.
Notable exceptions:
gcc - I have not touched the a.out generation stuff there.
ldd/ldconfig - still have some code to interface with a.out rtld.
old as/ld/etc - I have not removed these yet, pending their move to ports.
some includes - necessary for ldd/ldconfig for now.
Tested on: i386 (extensively), alpha
Notes
Notes:
svn path=/head/; revision=103436
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 357f6432716c..51609ef68e4c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -156,7 +156,6 @@ WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} # /usr/games added for fortune which depend on strfile STRICTTMPPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games TMPPATH= ${STRICTTMPPATH}:${PATH} -OBJFORMAT_PATH?= /usr/libexec INSTALLTMP!= /usr/bin/mktemp -d -u -t install @@ -186,7 +185,6 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ CPUTYPE=${TARGET_CPUTYPE} \ - OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \ GROFF_BIN_PATH=${WORLDTMP}/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \ GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac @@ -222,11 +220,10 @@ IMAKEENV= ${CROSSENV} \ IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage -KMAKEENV= ${WMAKEENV} \ - OBJFORMAT_PATH=${WORLDTMP}/usr/libexec:${OBJFORMAT_PATH} +KMAKEENV= ${WMAKEENV} USRDIRS= usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \ - usr/libexec/${OBJFORMAT} usr/sbin usr/share/misc \ + usr/libexec usr/sbin usr/share/misc \ usr/share/dict \ usr/share/groff_font/devX100 \ usr/share/groff_font/devX100-12 \ @@ -654,7 +651,7 @@ _xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint cross-tools: .for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ - gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \ + gnu/usr.bin/binutils usr.sbin/crunch/crunchide \ gnu/usr.bin/cc ${_xlint} ${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ @@ -689,8 +686,8 @@ libraries: # shared libraries for ELF. # _startup_libs= gnu/lib/csu gnu/lib/libgcc -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-${OBJFORMAT}) -_startup_libs+= lib/csu/${MACHINE_ARCH}-${OBJFORMAT} +.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) +_startup_libs+= lib/csu/${MACHINE_ARCH}-elf .else _startup_libs+= lib/csu/${MACHINE_ARCH} .endif |