- back to CXXLINK instead of hardcoded g++ - should work now.