remove the old (and nonworking) hack and identify our patched GCCs properly