Date: Wed, 16 Oct 2013 16:05:13 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256635 - projects/bmake/share/mk Message-ID: <201310161605.r9GG5DoU016366@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Wed Oct 16 16:05:12 2013 New Revision: 256635 URL: http://svnweb.freebsd.org/changeset/base/256635 Log: Handle the different expectations of MACHINE_ARCH b/w buildworld etc and dirdeps. Modified: projects/bmake/share/mk/local.sys.mk Modified: projects/bmake/share/mk/local.sys.mk ============================================================================== --- projects/bmake/share/mk/local.sys.mk Wed Oct 16 16:03:01 2013 (r256634) +++ projects/bmake/share/mk/local.sys.mk Wed Oct 16 16:05:12 2013 (r256635) @@ -63,7 +63,20 @@ MACHINE_ARCH_LIST.$m?= ${TARGET_ARCHES_$ MACHINE_ARCH.$m?= ${MACHINE_ARCH_LIST.$m:[1]} BOOT_MACHINE_DIR.$m ?= boot/$m .endfor -MACHINE_ARCH:= ${TARGET_ARCH:U${MACHINE_ARCH.${MACHINE}}} +.ifndef _TARGET_SPEC +.if empty(MACHINE_ARCH) +.if !empty(TARGET_ARCH) +MACHINE_ARCH= ${TARGET_ARCH} +.else +MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} +.endif +.endif +MACHINE_ARCH?= ${MACHINE_ARCH.${MACHINE}} +MACHINE_ARCH:= ${MACHINE_ARCH} +.else +# we got here via dirdeps +MACHINE_ARCH:= ${MACHINE_ARCH.${MACHINE}} +.endif .if !defined(_TARGETS) # some things we do only once @@ -206,9 +219,10 @@ CXXFLAGS_LAST += ${CFLAGS_LAST.${COMPILE # if ld suppored sysroot, this would suffice CFLAGS_LAST+= --sysroot=${STAGE_OBJTOP} .endif -.endif LDFLAGS_LAST+= -Wl,-rpath-link,${STAGE_LIBDIR} STAGED_INCLUDE_DIR= ${STAGE_OBJTOP}/usr/include +.endif + .if ${USE_META:Uyes} == "yes" .include "meta.sys.mk" .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310161605.r9GG5DoU016366>