Fix build with LLVM top-of-tree
Merge pull request #543 from mmp/master

Fix build with LLVM top-of-tree