cl/gcc-adapt-ext: Small changes for setting working environment only.
@NOTE: Remove this commit before merging to the master! (w/ git rebase)