shithub: mc

Info  •  Files  •  Log  •  Branches

Search the default path for a library.

    We had missed a couple of search paths.

--- a/lib/sys/sys+osx-x64.myr

+++ b/lib/sys/sys+osx-x64.myr

@@ -658,8 +658,6 @@

 	const kevent	: (q : fd, cl : kevent[:], el : kevent[:], flg : kflags, timeout : timespec# -> int64)

 	const kevent64	: (q : fd, cl : kevent64[:], el : kevent64[:], flg : kflags, timeout : timespec# -> int64)

-

-

 	/* networking */

 	const socket	: (dom : sockfam, stype : socktype, proto : sockproto	-> fd)

 	const connect	: (sock	: fd, addr : sockaddr#, len : size -> int)

--- a/mbld/build.myr

+++ b/mbld/build.myr

@@ -438,6 +438,12 @@

 		;;

 		std.slfree(p)

 	;;

+

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

+	if std.fexists(p)

+		-> `std.Some p

+	;;

+	std.slfree(p)

 	-> `std.None

 }

@@ -459,6 +465,7 @@

 			for inc in targ.incpath

 				std.fput(1, "\t{}\n", inc)

 			;;

+			std.fput(1, "\t{}/{}\n", opt_instroot, config.Libpath)

 			std.exit(1)

 		;;

 	;;

--- a/mbld/deps.myr

+++ b/mbld/deps.myr

@@ -374,7 +374,11 @@

 	| `std.Ok file:	-> file

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

 	;;

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

+	std.put("could not find library {} in search path:\n", lib)

+	for p in incs

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

+	;;

+	std.fatal("\t{}\n", config.Libpath)

 }

 /* pushes a dep into the dependency list */