Fixes for building singularity container with intel #37

Closed thomas-robinson closed 3 years ago