Also fix some setup hooks that unnecessarily used environment hooks, which revolted in the same variable being modified too many times.
Package changes from 3.6: - CMake exports patch no longer necessary - Cosmetic purity patch fix - Build libc++ with private libc++abi headers visible from sources - Work around bugs in lldb's configure scripts