Use ARCH instead of MACHINE to check for mips.
ClosedPublic
Actions

Authored by jhb on Nov 28 2019, 4:53 PM.

Details

Reviewers

jbeich
bapt

Group Reviewers

portmgr
O5: Ports Framework	(Owns No Changed Paths)

Commits

rP520454: Use ARCH instead of MACHINE to check for mips.

Summary

Cross-building ports via CROSS_TOOLCHAIN and CROSS_SYSROOT only set
ARCH to the target arch. MACHINE still references the host. This
unbreaks cross-building ports for mips.

Test Plan

try to cross-build base/gcc and have it fail due to SSP flags in CFLAGS

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 27834
Build 26012: arc lint + arc unit

Event Timeline

jhb created this revision.Nov 28 2019, 4:53 PM

Owners added a reviewer: O5: Ports Framework.Nov 28 2019, 4:53 PM

Herald added 1 blocking reviewer(s): portmgr. · View Herald TranscriptNov 28 2019, 4:53 PM

Herald added a subscriber: mat. · View Herald Transcript

Harbormaster completed remote builds in B27834: Diff 65008.Nov 28 2019, 4:53 PM

jhb added a child revision: D22594: Update base/gcc to work with devel/freebsd-gcc6..Nov 28 2019, 5:04 PM

lwhsu added a subscriber: lwhsu.Dec 2 2019, 8:26 AM

Ping, this breaks using CROSS_TOOLCHAIN and CROSS_SYSROOT with mips.

Looks OK:

${ARCH} is defined in <bsd.port.options.mk> but Mk/bsd.ssp.mk is processed in <bsd.port.post.mk>
logic didn't change because mips64 was part of mips set, which I originally cargo-culted from <bsd.sys.mk> (after minor testing)

Sorry, I don't have time to reproduce your issue.