aboutsummaryrefslogtreecommitdiff
path: root/bin/9l
diff options
context:
space:
mode:
authorRuss Cox <rsc@swtch.com>2020-01-19 21:10:11 -0500
committerRuss Cox <rsc@swtch.com>2020-01-19 23:04:58 -0500
commitcb8f7357867a2a5d0bd742ceeb77bce9ad5f435c (patch)
treee21e8faaa68f8df48632973444a664f582de719a /bin/9l
parent8d82ccefd2b4b058e20ae0a7e3d9ef9b6b8cf8c3 (diff)
downloadplan9port-cb8f7357867a2a5d0bd742ceeb77bce9ad5f435c.tar.gz
plan9port-cb8f7357867a2a5d0bd742ceeb77bce9ad5f435c.tar.bz2
plan9port-cb8f7357867a2a5d0bd742ceeb77bce9ad5f435c.zip
all: remove Linux 2.4 vs 2.6 detection
Linux 2.4 is dead. (The libthread code hasn't worked for Linux 2.4 for a long time.)
Diffstat (limited to 'bin/9l')
-rwxr-xr-xbin/9l17
1 files changed, 6 insertions, 11 deletions
diff --git a/bin/9l b/bin/9l
index 8af27154..a10aab72 100755
--- a/bin/9l
+++ b/bin/9l
@@ -25,12 +25,7 @@ case "$tag" in
*Linux*)
ld=${CC9:-gcc}
userpath=true
- extralibs="$extralibs -lutil -lresolv"
- case "${SYSVERSION:-`uname -r`}" in
- 2.6.* | [3-9].* | [1-9][0-9].*)
- extralibs="$extralibs -lpthread"
- ;;
- esac
+ extralibs="$extralibs -lutil -lresolv -lpthread"
;;
*Darwin*x86_64*)
ld="${CC9:-gcc} -m64"
@@ -41,7 +36,7 @@ case "$tag" in
*SunOS*)
ld="${CC9:-cc} -g"
extralibs="$extralibs -lrt -lpthread -lsocket -lnsl"
- # Record paths to shared libraries to avoid needing LD_LIBRARY_PATH
+ # Record paths to shared libraries to avoid needing LD_LIBRARY_PATH
for i in "$libsl $@"
do
case "$i" in
@@ -106,7 +101,7 @@ then
lpaths="$lpaths $l"
esac
done
-
+
if $verbose
then
echo "ofiles $ofiles"
@@ -309,7 +304,7 @@ then
frameworks=""
for i in $autoframeworks
- do
+ do
frameworks="-framework $i $frameworks"
done
fi
@@ -335,8 +330,8 @@ fi
xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out"
xxout() {
- sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . |
- egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub'
+ sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . |
+ egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub'
rm -f $xtmp
}