shithub: mc

Download patch

ref: 8ba9576c691e652534586d8ea337b20aef34eb49
parent: c3385258255b61bdfc24f194c8d7104b57a33102
author: Ori Bernstein <orib@google.com>
date: Mon Oct 1 09:33:30 EDT 2012 

Merging usefiles works on .use, not .o


--- a/myrbuild/myrbuild.c
+++ b/myrbuild/myrbuild.c
@@ -208,13 +208,12 @@
     lappend(&args, &nargs, strdup("-mo"));
     lappend(&args, &nargs, strdup(libname));
     for (i = 0; i < nfiles; i++) {
-        if (hassuffix(files[i], ".myr"))
-            swapsuffix(buf, sizeof buf, files[i], ".myr", ".o");
-        else if (hassuffix(files[i], ".s"))
-            swapsuffix(buf, sizeof buf, files[i], ".s", ".o");
-        else
+        if (hassuffix(files[i], ".myr")) {
+            swapsuffix(buf, sizeof buf, files[i], ".myr", ".use");
+            lappend(&args, &nargs, strdup(buf));
+        } else if (!hassuffix(files[i], ".s")) {
             die("Unknown file type %s", files[i]);
-        lappend(&args, &nargs, strdup(buf));
+        }
     }
     lappend(&args, &nargs, NULL);
 
-- 
⑨