Build of FreeBSD-10 fails on 9 with unknown target CPU

[Yuri]

On 06/13/2014 12:03, Rolf Nielsen wrote:
> As I stated in my previous reply, to Warren Block's question, I don't
> remember where I found it. However, on my 10.0-STABLE r265900 I found
> these lines in /usr/share/examples/etc/make.conf

Ok, 10 source has corei7 in share/examples/etc/make.conf, so should be 
no problem.

My problem is probably because buildworld uses old /usr/share/mk/ make 
files (from FreeBSD 9 in my case).
I usually do 
buildworld,installworld,buildkernel,installkernel,mergemaster stages to 
update the system. However, these steps use the old /usr/share/mk/ 
files, and this causes this error "unknown target CPU 'amd64'" in 
buildworld.

Is there any recommended way to solve this dependency on the old 
makefiles during build of the newer version on the older system?

Yuri