--- dyld/dyld-1285.19/cache-builder/kernel_collection_builder.cpp
+++ dyld/dyld-1235.2/cache-builder/kernel_collection_builder.cpp
@@ -34,8 +34,6 @@
 #include <string>
 #include <vector>
 
-using mach_o::Platform;
-
 static const uint64_t kMinBuildVersion = 1; //The minimum version BuildOptions struct we can support
 static const uint64_t kMaxBuildVersion = 1; //The maximum version BuildOptions struct we can support
 
@@ -81,7 +79,7 @@
         va_list list;
         va_start(list, format);
         Diagnostics diag;
-        diag.error(format, va_list_wrap(list));
+        diag.error(format, list);
         va_end(list);
 
         errorStorage.push_back(diag.errorMessage());
@@ -162,7 +160,7 @@
     dyld3::closure::FileSystemNull fileSystem;
     const dyld3::GradedArchs& arch = dyld3::GradedArchs::forName(builder->arch);
     auto loaded = dyld3::MachOAnalyzer::loadFromBuffer(diag, fileSystem, fileInfo.path, arch,
-                                                       Platform(), fileInfo);
+                                                       dyld3::Platform::unknown, fileInfo);
     if ( !loaded ) {
         builder->error("in %s: %s", fileInfo.path, diag.errorMessage().c_str());
         return false;
@@ -567,7 +565,7 @@
     builderOptions.outputFilePath = runtimePath;
     builderOptions.outputMapFilePath = builderOptions.outputFilePath + ".json";
     builderOptions.archs = &dyld3::GradedArchs::forName(builder->arch);
-    builderOptions.platform = Platform();
+    builderOptions.platform = dyld3::Platform::unknown;
     builderOptions.localSymbolMode = DyldSharedCache::LocalSymbolsMode::keep;
     builderOptions.cacheConfiguration = kDyldSharedCacheTypeProduction;
     builderOptions.optimizeDyldDlopens = false;