Problem during kernel-build for a 6.x-to-7 upgrade

[clevershark]

I was doing an upgrade according to the instructions contained here:

http://people.freebsd.org/~rse/upgra...rade-6x-7x.txt

Things were going quite well until I got to the world-build and kernel-build instruction. I had an outdated directive (options GEOM_GPT) which resulted in the kernel build ending prematurely. At that point I had successfully completed the world-build, which in the instructions is done on the same line.

So I edited my kernel config file to remove the offending directive, and did a simple make kernel-build, but now the process doesn't even get started. I get this strange message:

only one machine directive is allowed

However I checked, and my machine configuration file only has the one machine directive. Has this happened to anyone else before? What could be causing this issue?