Fix incorrectly-placed set +e when building universal binaries.