[GEM-dev] more build-system updates