Found it. Somehow the revert didn't get applied when updating the 3.6 branch. Did a complete re-checkout and now bulding OSG again.
Found it. Somehow the revert didn't get applied when updating the 3.6 branch. Did a complete re-checkout and now bulding OSG again.