Import Upstream version 5d9upstream/5d9

1 files changed, 14 insertions, 9 deletions

diff --git a/mkimpcat.scm b/mkimpcat.scm
index f94f949..8f5929a 100644
--- a/mkimpcat.scm
+++ b/mkimpcat.scm
@@ -82,11 +82,15 @@
 			   (in-implementation-vicinity "ioext" link:able-suffix)
 			   (usr:lib "c"))
 		 (add-alias 'directory-for-each 'i/o-extensions)
+		 (add-alias 'directory 'i/o-extensions)
 		 (add-alias 'line-i/o 'i/o-extensions)
 		 (add-alias 'pipe 'i/o-extensions)))
 	  (cond ((add-link 'rev2-procedures
 			   (in-implementation-vicinity "sc2"
 						       link:able-suffix))))
+	  (cond ((add-link 'byte
+			   (in-implementation-vicinity "byte"
+						       link:able-suffix))))
 	  (cond ((or
 		  (add-link 'db
 			    (in-wb-vicinity "db.so"))
@@ -104,6 +108,8 @@
 			    (usr:lib "c")))
 		 (add-source 'wb-table
 			     (in-wb-vicinity "wbtab"))
+		 (add-source 'rwb-isam
+			     (in-wb-vicinity "rwb-isam"))
 		 (add-alias 'wb 'db)))
 	  (cond ((add-link 'mysql
 			   (in-implementation-vicinity "database"
@@ -194,15 +200,10 @@
 	(display* ")")
 	)
 
-      (begin
-	;; Messy because this trait has no C-installed feature name
-	(display* "#.(if (defined? renamed-identifier)")
-	(display* "      '(")
-	(display "       " op)
-	(add-source 'macro (in-implementation-vicinity "Macro"))
-	(display* "        )")
-	(display* "      '())")
-	)
+      (display* "#+" 'primitive-hygiene)
+      (display* "(")
+      (add-source 'macro (in-implementation-vicinity "Macro"))
+      (display* ")")
 
       (add-links 'dld
 		 (lambda (lib) (string-append "/usr/lib/lib" lib ".a"))
@@ -229,4 +230,8 @@
 		 (lambda (lib) #f)
 		 (lambda (lib) #f)
 		 ".so")
+      (add-links 'win32-dl
+                 (lambda (lib) #f)
+                 (lambda (lib) #f)
+                 ".dll")
       )))