fbsd10 rc1 buildworld fail (ContantMerge.cpp)

[Jakob Breivik Grimstveit]

On an updated 9.2 box, using generic kernconf on amd64, buildworld fails:

/usr/src/lib/clang/libllvmipo/../../../contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp:126:
error: expected primary-expression before 'GVI'
/usr/src/lib/clang/libllvmipo/../../../contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp:126:
error: 'E' was not declared in this scope
/usr/src/lib/clang/libllvmipo/../../../contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp:127:
error: 'GVI' was not declared in this scope
/usr/src/lib/clang/libllvmipo/../../../contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp:127:
error: expected primary-expression before ')' token
/usr/src/lib/clang/libllvmipo/../../../contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp:127:
error: expected `;' before ')' token
/usr/src/lib/clang/libllvmipo/../../../contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp:230:
error: expected `}' at end of input
/usr/src/lib/clang/libllvmipo/../../../contrib/llvm/lib/Transforms/IPO/ConstantMerge.cpp:230:
error: expected `}' at end of input
*** Error code 1

Stop.
bmake[3]: stopped in /usr/src/lib/clang/libllvmipo
*** Error code 1

Stop.
bmake[2]: stopped in /usr/src/lib/clang
*** Error code 1

Stop.
bmake[1]: stopped in /usr/src
*** Error code 1

Stop.
bmake: stopped in /usr/src
*** [buildworld] Error code 1

Stop in /usr/src.


What can I do to resolve this?


-- 
Vyrdsamt,
    Jakob Breivik Grimstveit | +47 4829 8152
    http://grimstveit.no/jakob