diff --git a/opencl_clang.cpp b/opencl_clang.cpp
index 4178b9c..b495551 100644
--- a/opencl_clang.cpp
+++ b/opencl_clang.cpp
@@ -235,7 +235,8 @@ Compile(const char *pszProgramSource, const char **pInputHeaders,
           new llvm::vfs::InMemoryFileSystem);
       OverlayFS->pushOverlay(MemFS);
 
-      compiler->createFileManager(std::move(OverlayFS));
+      compiler->setVirtualFileSystem(std::move(OverlayFS));
+      compiler->createFileManager();
       compiler->createSourceManager(compiler->getFileManager());
 
       // Create compiler invocation from user args before trickering with it