Fix CC issues to resolve trying to link to shared libs instead of static. Remove functions that are now integrated with the new CC.

This commit is ONLY for the Cross-Compiler.
Nothing else should be affected by these changes.
Merge branch 'bugfixes' into 3.1