Additional includes in std.core, new std.regex and std.threading

1 files changed, 20 insertions, 12 deletions

diff --git a/buildfile b/buildfile
index 630e684..f301ef1 100644
--- a/buildfile
+++ b/buildfile
@@ -39,10 +39,12 @@ else
     # Use the naming scheme expected by -fprebuilt-module-path=. Can also be
     # specified with -fmodule-file=.
     #
-    core = std.core.pcm
-    io   = std.io.pcm
+    core      = std.core.pcm
+    io        = std.io.pcm
+    regex     = std.regex.pcm
+    threading = std.threading.pcm
 
-    liba{std-modules}: bmia{$core $io}
+    liba{std-modules}: bmia{$core $io $regex $threading}
 
     export_target = $out_root/liba{std-modules}
   }
@@ -53,17 +55,19 @@ else
     #
     # @@ Currently VC looks in Release regardless of /MD or /MDd.
     #
-    dir  = release/
-    core = $dir/std.core.ifc
-    io   = $dir/std.io.ifc
+    dir       = release/
+    core      = $dir/std.core.ifc
+    io        = $dir/std.io.ifc
+    regex     = $dir/std.regex.ifc
+    threading = $dir/std.threading.ifc
 
-    bmia{$core $io}: fsdir{$dir}
+    bmia{$core $io $regex $threading}: fsdir{$dir}
 
     # VC expects to find std.lib next to the .ifc's. Make it the real one
     # while std-modules -- a dummy.
     #
     ./: $dir/liba{std}
-    $dir/liba{std}: bmia{$core $io}
+    $dir/liba{std}: bmia{$core $io $regex $threading}
     liba{std-modules}: cxx{dummy.cxx}
 
     # @@ Doesn't work if installed so we don't bother installing it. But we
@@ -87,11 +91,15 @@ else
   if ($cxx.target.class != "windows")
     cxx.libs += -lpthread
 
-  bmia{$core}: mxx{std-core}
-  bmia{$io}:   mxx{std-io} bmia{$core}
+  bmia{$core}:      mxx{std-core}
+  bmia{$io}:        mxx{std-io} bmia{$core}
+  bmia{$regex}:     mxx{std-regex} bmia{$core} bmia{$io}
+  bmia{$threading}: mxx{std-threading} bmia{$core}
 
-  mxx{std-core}@./: cc.module_name = std.core
-  mxx{std-io}@./:   cc.module_name = std.io
+  mxx{std-core}@./:      cc.module_name = std.core
+  mxx{std-io}@./:        cc.module_name = std.io
+  mxx{std-regex}@./:     cc.module_name = std.regex
+  mxx{std-threading}@./: cc.module_name = std.threading
 
   # Install into the libstd-modules/ subdirectory of, say, /usr/include/.
   #