Backport buildsystem changes to releases/2.7

I have an application that relies on 2.7 and shared libraries. It requires this small fix that is present on master on the releases/2.7 branch.