shot in the dark.
Merge topic 'cross-compiling-toolchain-variables' into next

861c637 shot in the dark.