Revert "revert Support complex toolchains"

This reverts commit fa08f7ed80c07e0c196c3d14ba4da5684c8e3382.
few more of my adjustments