Fix 386 and arm cross-compile

Sorry @crosbymichael :x