Deleted Added
sdiff udiff text old ( 136910 ) new ( 137288 )
full compact
Makefile.inc1 (136910) Makefile.inc1 (137288)
1#
1#
2# $FreeBSD: head/Makefile.inc1 136910 2004-10-24 15:33:08Z ru $
2# $FreeBSD: head/Makefile.inc1 137288 2004-11-06 03:14:26Z peter $
3#
4# Make command line options:
5# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
6# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
7# -DNO_RESCUE do not build rescue binaries
8# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
9# -DNOCLEAN do not clean at all
10# -DNOCRYPT will prevent building of crypt versions

--- 185 unchanged lines hidden (view full) ---

196
197# world stage
198WMAKEENV= ${CROSSENV} \
199 _SHLIBDIRPREFIX=${WORLDTMP} \
200 INSTALL="sh ${.CURDIR}/tools/install.sh" \
201 PATH=${TMPPATH}
202WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
203
3#
4# Make command line options:
5# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
6# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
7# -DNO_RESCUE do not build rescue binaries
8# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
9# -DNOCLEAN do not clean at all
10# -DNOCRYPT will prevent building of crypt versions

--- 185 unchanged lines hidden (view full) ---

196
197# world stage
198WMAKEENV= ${CROSSENV} \
199 _SHLIBDIRPREFIX=${WORLDTMP} \
200 INSTALL="sh ${.CURDIR}/tools/install.sh" \
201 PATH=${TMPPATH}
202WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
203
204.if ${MACHINE_ARCH} == amd64
205# 32 bit world
206LIB32TMP= ${OBJTREE}${.CURDIR}/lib32
207
208LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT
209LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \
210 -L${LIB32TMP}/usr/lib32 \
211 -B${LIB32TMP}/usr/lib32
212LIB32CC= ${LIB32PREFLAGS} \
213 ${LIB32POSTFLAGS}
214LIB32CXX= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \
215 ${LIB32POSTFLAGS}
216LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \
217 ${LIB32POSTFLAGS}
218
219# Yes, the flags are redundant.
220LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
221 _SHLIBDIRPREFIX=${LIB32TMP} \
222 MACHINE_ARCH=i386 \
223 INSTALL="sh ${.CURDIR}/tools/install.sh" \
224 PATH=${TMPPATH} \
225 CC="cc ${LIB32CC}" \
226 CXX="c++ ${LIB32CXX}" \
227 OBJC="cc ${LIB32OBJC}" \
228 LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
229 AS="as --32" \
230 LIBDIR=/usr/lib32 \
231 SHLIBDIR=/usr/lib32
232
233LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
234 -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \
235 CC="cc ${LIB32CC}" \
236 CXX="c++ ${LIB32CXX}" \
237 OBJC="cc ${LIB32OBJC}" \
238 LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
239 AS="as --32" \
240 LIBDIR=/usr/lib32 \
241 SHLIBDIR=/usr/lib32
242.endif
243
204# install stage
205.if empty(.MAKEFLAGS:M-n)
206IMAKEENV= ${CROSSENV} \
207 PATH=${STRICTTMPPATH}:${INSTALLTMP}
208.else
209IMAKEENV= ${CROSSENV} \
210 PATH=${TMPPATH}:${INSTALLTMP}
211.endif

--- 121 unchanged lines hidden (view full) ---

333 @echo "--------------------------------------------------------------"
334 ${_+_}cd ${.CURDIR}; ${WMAKE} par-depend
335everything:
336 @echo
337 @echo "--------------------------------------------------------------"
338 @echo ">>> stage 4.4: building everything"
339 @echo "--------------------------------------------------------------"
340 ${_+_}cd ${.CURDIR}; ${WMAKE} par-all
244# install stage
245.if empty(.MAKEFLAGS:M-n)
246IMAKEENV= ${CROSSENV} \
247 PATH=${STRICTTMPPATH}:${INSTALLTMP}
248.else
249IMAKEENV= ${CROSSENV} \
250 PATH=${TMPPATH}:${INSTALLTMP}
251.endif

--- 121 unchanged lines hidden (view full) ---

373 @echo "--------------------------------------------------------------"
374 ${_+_}cd ${.CURDIR}; ${WMAKE} par-depend
375everything:
376 @echo
377 @echo "--------------------------------------------------------------"
378 @echo ">>> stage 4.4: building everything"
379 @echo "--------------------------------------------------------------"
380 ${_+_}cd ${.CURDIR}; ${WMAKE} par-all
381.if ${MACHINE_ARCH} == amd64
382build32:
383 @echo
384 @echo "--------------------------------------------------------------"
385 @echo ">>> stage 5.1: building 32 bit shim libraries"
386 @echo "--------------------------------------------------------------"
387.for _dir in \
388 lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
389 usr/libexec usr/sbin usr/share/misc \
390 usr/share/snmp/defs usr/share/snmp/mibs
391 mkdir -p ${LIB32TMP}/${_dir}
392.endfor
393 mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
394 -p ${LIB32TMP}/usr/include >/dev/null
395 ln -sf ${.CURDIR}/sys ${WORLDTMP}
396.for _t in obj includes
397 cd ${.CURDIR}/include; \
398 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
399 cd ${.CURDIR}/lib; \
400 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
401 cd ${.CURDIR}/gnu/lib; \
402 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
403.if !defined(NOCRYPT)
404 cd ${.CURDIR}/secure/lib; \
405 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
406.endif
407.endfor
408.for _dir in lib/libncurses lib/libmagic
409 cd ${.CURDIR}/${_dir}; \
410 MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
411.endfor
412 cd ${.CURDIR}; \
413 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries
414.for _t in obj depend all
415 cd ${.CURDIR}/libexec/rtld-elf; \
416 PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
417.endfor
341
418
419install32:
420 mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree
421 cd ${.CURDIR}/lib; ${LIB32MAKE} install
422 cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install
423.if !defined(NOCRYPT)
424 cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install
425.endif
426 cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install
427.endif
342
428
429
343WMAKE_TGTS=
344.if !defined(SUBDIR_OVERRIDE)
345WMAKE_TGTS+= _worldtmp _legacy _bootstrap-tools
346.endif
347WMAKE_TGTS+= _cleanobj _obj _build-tools
348.if !defined(SUBDIR_OVERRIDE)
349WMAKE_TGTS+= _cross-tools
350.endif
351WMAKE_TGTS+= _includes _libraries _depend everything
430WMAKE_TGTS=
431.if !defined(SUBDIR_OVERRIDE)
432WMAKE_TGTS+= _worldtmp _legacy _bootstrap-tools
433.endif
434WMAKE_TGTS+= _cleanobj _obj _build-tools
435.if !defined(SUBDIR_OVERRIDE)
436WMAKE_TGTS+= _cross-tools
437.endif
438WMAKE_TGTS+= _includes _libraries _depend everything
439.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
440WMAKE_TGTS+= build32
441.endif
352
353buildworld: ${WMAKE_TGTS}
354.ORDER: ${WMAKE_TGTS}
355
356TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything}
357toolchain: ${TOOLCHAIN_TGTS}
358kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
359

--- 114 unchanged lines hidden (view full) ---

474 @echo ">>> Making hierarchy"
475 @echo "--------------------------------------------------------------"
476 ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 hierarchy
477 @echo
478 @echo "--------------------------------------------------------------"
479 @echo ">>> Installing everything"
480 @echo "--------------------------------------------------------------"
481 ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
442
443buildworld: ${WMAKE_TGTS}
444.ORDER: ${WMAKE_TGTS}
445
446TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything}
447toolchain: ${TOOLCHAIN_TGTS}
448kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
449

--- 114 unchanged lines hidden (view full) ---

564 @echo ">>> Making hierarchy"
565 @echo "--------------------------------------------------------------"
566 ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 hierarchy
567 @echo
568 @echo "--------------------------------------------------------------"
569 @echo ">>> Installing everything"
570 @echo "--------------------------------------------------------------"
571 ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
572.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32)
573 ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
574.endif
482
483redistribute:
484 @echo "--------------------------------------------------------------"
485 @echo ">>> Distributing everything"
486 @echo "--------------------------------------------------------------"
487 ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
488
489#

--- 498 unchanged lines hidden --- 		575
576redistribute:
577 @echo "--------------------------------------------------------------"
578 @echo ">>> Distributing everything"
579 @echo "--------------------------------------------------------------"
580 ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
581
582#

--- 498 unchanged lines hidden ---