summaryrefslogtreecommitdiff
path: root/myrbuild
diff options
context:
space:
mode:
authorOri Bernstein <orib@google.com>2012-10-19 14:33:03 -0400
committerOri Bernstein <orib@google.com>2012-10-19 14:33:03 -0400
commit46ed41336621a10e35d0febce05d0ac1a4dcfa48 (patch)
tree105a840b4845edc007a19f621fd3aec8c7be40cb /myrbuild
parent94932c665b01982ed386de8fe958168001a95dec (diff)
downloadmc-46ed41336621a10e35d0febce05d0ac1a4dcfa48.tar.gz
Make builds a bit more OSX friendly
Diffstat (limited to 'myrbuild')
-rw-r--r--myrbuild/myrbuild.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/myrbuild/myrbuild.c b/myrbuild/myrbuild.c
index 3923967..d38b910 100644
--- a/myrbuild/myrbuild.c
+++ b/myrbuild/myrbuild.c
@@ -287,16 +287,15 @@ void linkobj(char **files, size_t nfiles)
die("Unknown file type %s", files[i]);
lappend(&args, &nargs, strdup(buf));
}
- lappend(&args, &nargs, strdup("-L"));
- snprintf(buf, sizeof buf, "%s%s", Instroot, "/myr/lib");
+ snprintf(buf, sizeof buf, "-L%s%s", Instroot, "/lib/myr");
lappend(&args, &nargs, strdup(buf));
for (i = 0; i < nincpaths; i++) {
lappend(&args, &nargs, strdup("-L"));
lappend(&args, &nargs, strdup(incpaths[i]));
}
for (i = 0; i < nlibs; i++) {
- lappend(&args, &nargs, strdup("-l"));
- lappend(&args, &nargs, strdup(libs[i]));
+ snprintf(buf, sizeof buf, "-l%s", libs[i]);
+ lappend(&args, &nargs, strdup(buf));
}
lappend(&args, &nargs, NULL);