shithub: mc

Download patch

ref: b1c1b98b1c37378ae230705e55cf6abae8906407
parent: 177573cce9c9ec978a88fe23814422fa2c740b0e
author: Ori Bernstein <[email protected]>
date: Wed Apr 15 17:59:59 EDT 2015

Default to searching instroot correctly.

--- a/mbld/build.myr
+++ b/mbld/build.myr
@@ -303,9 +303,6 @@
 		for inc in incs
 			cmd = std.slpush(cmd, std.fmt("-L%s", inc))
 		;;
-		if opt_instroot.len > 0
-			cmd = std.slpush(cmd, std.fmt("-L%s%s", opt_instroot, "/lib/myr"))
-		;;
 	;;
 
 	libs = std.htkeys(libgraph)
--- a/mbld/parse.myr
+++ b/mbld/parse.myr
@@ -280,7 +280,7 @@
 	inst = true
 	ldscript = ""
 	runtime = ""
-	incpath = [][:]
+	incpath = std.sldup(bld.opt_incpaths)
 	for elt in attrs
 		match elt
 		| ("ldscript", lds):	ldscript = std.sldup(lds)