Merge "Add missing $() when testing TARGET_ARCH."