Prepares a subtarget variable for cases where it is not 'generic'

Signed-off-by: Adrian Schmutzler <[email protected]>
Reviewed-by: Fabian Bläse <[email protected]>
- Rebased
Signed-off-by: Tim Niemeyer <[email protected]>