Changeset View
Changeset View
Standalone View
Standalone View
include/Makefile
Show First 20 Lines • Show All 386 Lines • ▼ Show 20 Lines | |||||
.include <bsd.prog.mk> | .include <bsd.prog.mk> | ||||
installincludes: ${SHARED} | installincludes: ${SHARED} | ||||
${SHARED}: compat | ${SHARED}: compat | ||||
.if ${MACHINE} == "host" && !defined(_SKIP_BUILD) | .if ${MACHINE} == "host" && !defined(_SKIP_BUILD) | ||||
# we're here because we are building a sysroot... | # we're here because we are building a sysroot... | ||||
# we need MACHINE et al set correctly | # we need MACHINE et al set correctly | ||||
HOST_MACHINE!= uname -m | HOST_MACHINE!= uname -m | ||||
bdrewery: Testing this piece is weird because it's part of a totally different build system. | |||||
Not Done Inline ActionsYes, this looks questionable.... and there should be no need to touch host-target.mk There should be a very clear distinction between the "host" and the "target" In our build (Junos and FreeBSD) we use the pseudo MACHINE "host" to trigger building for the host and its objdir is named with the value of ${HOST_TARGET} eg. freebsd11-amd64 or linux3-x86_64 sjg: Yes, this looks questionable.... and there should be no need to touch host-target.mk
There… | |||||
HOST_MACHINE_ARCH!= uname -p | HOST_MACHINE_ARCH!= uname -p | ||||
MACHINE:= ${HOST_MACHINE} | MACHINE!= ${SRCTOP}/tools/build/build_machine.sh | ||||
MACHINE_ARCH:= ${HOST_MACHINE_ARCH} | MACHINE_ARCH!= ${SRCTOP}/tools/build/build_machine_arch.sh | ||||
.endif | .endif |
Testing this piece is weird because it's part of a totally different build system.
MACHINE=host WITH_DIRDEPS_BUILD=yes make -C include
I think your change and the two HOST_MACHINE[_ARCH] lines are not needed if you just fixup the arch in share/mk/host-target.mk. We'll definitey want @sjg signoff on touching that file though.