Merge remote-tracking branch 'upstream/master'

1 files changed, 3 insertions, 20 deletions

diff --git a/INSTALL b/INSTALL
index 0291e713..11d35005 100755
--- a/INSTALL
+++ b/INSTALL
@@ -66,23 +66,6 @@ DragonFly|*BSD)
 esac
 
 (
-if [ `uname` = Linux ]; then
-	# On Linux, we use the kernel version to decide whether
-	# to use pthreads or not.  On 2.6 versions that aren't
-	# linking with NPTL by default, pretend to be an older kernel.
-	echo "* Running on Linux: checking for NPTL..."
-	gcc lib/linux-isnptl.c -lpthread
-	if ./a.out >/dev/null
-	then	
-		echo "	NPTL found."
-		echo "SYSVERSION=2.6.x" >>$PLAN9/config
-	else
-		echo "	NPTL not found."
-		echo "SYSVERSION=2.4.x" >>$PLAN9/config
-	fi
-	rm -f ./a.out
-fi
-
 if [ `uname` = SunOS ]; then
 	# On Solaris x86, uname -p cannot be trusted.
 	echo "* Running on Solaris: checking architecture..."
@@ -168,7 +151,7 @@ if $dobuild; then
 		echo "* Error: mk failed to build."
 		exit 1
 	fi
-	
+
 	echo "* Building everything (be patient)..."
 	mk clean
 	mk libs-nuke
@@ -216,13 +199,13 @@ if $doinstall; then
 			mk man
 		)
 	fi
-	
+
 	if [ -x LOCAL.INSTALL ]; then
 		echo "* Running local modifications..."
 		echo cd `pwd`';' ./LOCAL.INSTALL
 		./LOCAL.INSTALL
 	fi
-	
+
 	echo "* Done. "
 	echo "	"
 	echo "* Add these to your profile environment."