shithub: mc

Info  •  Files  •  Log  •  Branches

Use 'config.Libpath' instead of hardcoding "lib/myr"

--- a/mbld/build.myr

+++ b/mbld/build.myr

@@ -331,6 +331,10 @@

 	else

 		match findlib(lib, incs)

 		| `std.None:

+			std.put("searched:\n")

+			for inc in incs

+				std.put("\t{}\n", inc)

+			;;

 			std.fatal("could not find library lib{}.a\n", lib)

 		| `std.Some p:

 			-> std.slput(cmd, head, p)

--- a/mbld/deps.myr

+++ b/mbld/deps.myr

@@ -267,7 +267,7 @@

 		| `std.Fail m:	/* nothing */

 		;;

 	;;

-	path = std.pathjoin([opt_instroot, "/lib/myr", lib][:])

+	path = std.pathjoin([opt_instroot, config.Libpath, lib][:])

 	match  bio.open(path, bio.Rd)

 	| `std.Ok file:	-> file

 	| `std.Fail m:	/* nothing */

--- a/mbld/main.myr

+++ b/mbld/main.myr

@@ -69,7 +69,7 @@

 		;;

 	;;

 	if bld.opt_instroot.len > 0 && !std.sleq(bld.opt_instroot, "none")

-		libpath = std.pathcat(bld.opt_instroot, "lib/myr")

+		libpath = std.pathcat(bld.opt_instroot, config.Libpath)

 		bld.opt_incpaths = std.slpush(bld.opt_incpaths, libpath)

 	;;