Fix configuration to use toolchain ld
Merge remote-tracking branch 'cgreenhalgh/master'