Revert "Don't specify TARGET and TARGET_ARCH in environment, they will"

This reverts commit 356a853c58e5346f1f61ac0f4632a0b5ddf48ca2.
Another attempt to fix build.