diff options
| author | marcel <marcel@FreeBSD.org> | 1999-11-15 17:07:45 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 1999-11-15 17:07:45 +0000 |
| commit | 2d8cd2480b6f5aa81008b59fa9c746d1dfb46912 (patch) | |
| tree | dfd40cfa9cf7938e658d75cb5c1bc56187a3ff3b | |
| parent | 8ed26df117cc99461094f76f9367dddefdf487f5 (diff) | |
| download | FreeBSD-src-2d8cd2480b6f5aa81008b59fa9c746d1dfb46912.zip FreeBSD-src-2d8cd2480b6f5aa81008b59fa9c746d1dfb46912.tar.gz | |
Remove CROSS_MAKE_FLAGS.
| -rw-r--r-- | Makefile.inc1 | 15 | ||||
| -rw-r--r-- | usr.bin/make/Makefile | 2 |
2 files changed, 3 insertions, 14 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index f494ada..584766e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -136,17 +136,6 @@ MK_FLAGS= -DWORLD -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED .endif # -# If we're building a cross world, define MACHINE and MACHINE_ARCH for -# the version of make that we're using. -# -.if defined(TARGET) -CROSS_MAKE_FLAGS+=-DMACHINE=\"${TARGET}\" -.endif -.if defined(TARGET_ARCH) -CROSS_MAKE_FLAGS+=-DMACHINE_ARCH=\"${TARGET_ARCH}\" -.endif - -# # Define the location of the temporary installation directory. Note that # MAKEOBJDIRPREFIX normally isn't defined so if the current directory is # /usr/src, then the world temporary directory is /usr/obj/usr/src/tmp. @@ -260,7 +249,7 @@ buildworld: check-objformat ( \ cd ${.CURDIR}/usr.bin/make; \ MAKEOBJDIRPREFIX=""; unset MAKEOBJDIRPREFIX; \ - ${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} all CROSS_MAKE_FLAGS='${CROSS_MAKE_FLAGS}'; \ + ${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} all; \ ${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} install; \ ${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} clean \ ) @@ -508,7 +497,7 @@ bootstrap: cd ${.CURDIR}/include; ${MAKE} beforeinstall .endif cd ${.CURDIR}/usr.bin/make; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \ - ${MAKE} ${MK_FLAGS} all CROSS_MAKE_FLAGS='${CROSS_MAKE_FLAGS}'; \ + ${MAKE} ${MK_FLAGS} all; \ ${MAKE} ${MK_FLAGS} -B install ${CLEANDIR} ${OBJDIR} cd ${.CURDIR}/usr.bin/xinstall; ${MAKE} ${MK_FLAGS} ${_DEPEND}; \ ${MAKE} ${MK_FLAGS} all; \ diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index 7530945..da2c13d 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= make -CFLAGS+= -I${.CURDIR} ${CROSS_MAKE_FLAGS} +CFLAGS+= -I${.CURDIR} SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \ make.c parse.c str.c suff.c targ.c var.c util.c SRCS+= lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \ |
