modified build
Merge https://github.com/jonathanhamm/ccomp