diff options
| author | sjg <sjg@FreeBSD.org> | 2013-10-16 16:05:12 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-10-16 16:05:12 +0000 |
| commit | ab7cd266bc446ecef527302d35a6910f1c4fc589 (patch) | |
| tree | 2ba3c25c7535e162c5ff0f102f67fa494c7e6bf6 /share/mk/local.sys.mk | |
| parent | b8d13cc6d3a313e63f1bdc5c2b211a2219853868 (diff) | |
| download | FreeBSD-src-ab7cd266bc446ecef527302d35a6910f1c4fc589.zip FreeBSD-src-ab7cd266bc446ecef527302d35a6910f1c4fc589.tar.gz | |
Handle the different expectations of MACHINE_ARCH b/w buildworld etc
and dirdeps.
Diffstat (limited to 'share/mk/local.sys.mk')
| -rw-r--r-- | share/mk/local.sys.mk | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 6376b94..2ac427f 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -63,7 +63,20 @@ MACHINE_ARCH_LIST.$m?= ${TARGET_ARCHES_${m}:U$m} 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.${COMPILER_TYPE}} # 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 |
