Merge pull request #3979 from radical/fix-xbuild-tgt