stage updates did break gcj, gdc, gnat builds

[Matthias Klose <doko@debian.org>]

So, r5655 did break these builds. Reverted the patch again, and checked in a fix
which doesn't break the native builds.  Could you verify that it still fixes the
cross cases?

Thanks, Matthias