Revert r185882. This is causing problems with the gold linker and might be better handled by the linker.
Update the CMake build files.