Refer to RPATH consistently.
Merge topic 'cross-compiling-toolchain-variables' into next

544698a Refer to RPATH consistently.