Upgrade messed up - cannot make buildworld from 11.0-RELEASE

[Jon Theil Nielsen]

Somehow I messed up an upgrade from 11.1-RELEASE to 11.2-RELEASE.

I can only boot into an old 11.0 kernel in single user mode. uname -a:

FreeBSD  11.0-RELEASE-p8 FreeBSD 11.0-RELEASE-p8 #0: Wed Feb 22 06:12:04
UTC 2017

I'm not able to run make buildworld from a 11.1-RELEASE source tree. The
first error was a missing include/__undef_min_max which I had to copy
manyally:

cp /usr/src/contrib/libc++/include/__undef_min_max /usr/include/c++/v1/

Now I'm getting new errors like

/usr/include/c++/v1/__split_buffer:13:1: error: unknown type name
'_LIBCPP_PUSH_MACROS'

and

sr/include/c++/v1/__split_buffer:17:1: error: expected unqualified-id.

Can anyone suggest a solution?

Thanks in advance

Jon Theil Nielsen
-- 
Jon Theil Nielsen