Building swift-frontend and swift-driver on OSX without separate dlls

Hiya,

In the past when I've built swift-frontend etc with build-script, it has built a large, monolithic compiler with no dll dependencies except platform dlls (libSystem etc.) so it can easily be deployed to other machines.

With the most recent versions of the compiler (6.2 or so), it's now building the swift driver swift-driver as well as the main swift-frontend and it seems like swift-driver (at least), now depends on a load of DLLs that are compiled locally, meaning it won't run unless I find all of these and move them around.

Looking at otool -l there are load commands even in swift-frontend...

Load command 17
          cmd LC_LOAD_DYLIB
      cmdsize 88
         name @rpath/lib_CompilerSwiftCompilerPluginMessageHandling.dylib (offset 24)
   time stamp 2 Thu Jan  1 01:00:02 1970
      current version 0.0.0
compatibility version 0.0.0

This is fairly tedious. Does it have to be this way? Is there a switch on utils/build-script to disable this and link these parts back into the compiler as before, so I can just deploy one binary, like I used to? I've got to code sign and deploy all these parts...

I'm happy to use ccmake or tinker with CMakefiles if I have to.

Thanks for any help or advice!

Regards,
Carl