am ebb4d67d: Don\'t export ARCH and SUBARCH, set them explicitly

* commit 'ebb4d67dbf10140dd48675bc8726013ce3e514f4':
  Don't export ARCH and SUBARCH, set them explicitly