Commit Diff

Commit:
54bcb7e9a2cc125c800c30075895315da9dc7c0a
From:
rsc <devnull@localhost>
Date:
Message:
use -Wl,-rpath for gcc
Actions:
Patch | Tree
commit - a0d2173ce4c9b9d530352f3890898ad3af19ae06
commit + 54bcb7e9a2cc125c800c30075895315da9dc7c0a
blob - 62e106e23cbc5881f700a0d3871369f1279289a1
blob + cd3d0ac92da53fe62643e2f185c4bf700b46e303
--- bin/9l
+++ bin/9l
@@ -186,7 +186,7 @@ case "$tag" in
 	ld="${CC9:-cc} -g"
 	extralibs="$extralibs -lrt -lpthread -lsocket -lnsl"
 	# Record paths to shared libraries to avoid needing LD_LIBRARY_PATH 
-	for i in "$@"
+	for i in "$libsl $@"
 	do
 		case "$i" in
 		-L*)
@@ -201,6 +201,20 @@ case "$tag" in
 	exit 1
 esac
 
+case "$ld" in
+gcc)
+	for i in "$libsl $@"
+	do
+		case "$i" in
+		-L*)
+			s=`echo $i | sed 's/-L/-Wl,-rpath,/'`
+			extralibs="$extralibs $s"
+			;;
+		esac
+	done
+	;;
+esac
+
 if $verbose
 then
 	echo $ld -L$PLAN9/lib "$@" $libsl $extralibs