1 files changed, 13 insertions, 1 deletions
diff --git a/bin/9l b/bin/9l
index e510e4d6..a7924e74 100755
--- a/bin/9l
+++ b/bin/9l
@@ -3,12 +3,24 @@
 extralibs=-lm
 tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
 case "$tag" in
-*FreeBSD*)	ld=gcc ;;
+*OpenBSD*)	ld=gcc
+		extralibs="$extralibs -lpthread"
+		;;
 *BSD*)		ld=gcc ;;
 *Linux*)	ld=gcc ;;
 *Darwin*)	ld=gcc ;;
 *SunOS*)	ld="${CC9:-cc} -g"
 		extralibs="$extralibs -lrt -lpthread -lsocket -lnsl"
+		# Record paths to shared libraries to avoid needing LD_LIBRARY_PATH 
+		for i in "$@"
+		do
+			case "$i" in
+			-L*)
+				s=`echo $i | sed 's/-L/-R/'`
+				extralibs="$extralibs $s"
+				;;
+			esac
+		done
 		;;
 *)
 	echo do not know how to link on "$tag" 1>&2