From 99dee78c2d44641ba56e5bb640d732f993b3dfa1 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Wed, 30 Dec 2020 07:39:16 -0500
Subject: all: remove $OBJTYPE from build

Now that we assume pthreads, the only assembly
left is in libmp and libsec.
We only ever added assembly for 386.
The portable C code is fine for plan9port.
---
 bin/9l | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'bin/9l')

diff --git a/bin/9l b/bin/9l
index f6eb0ba1..abca55fc 100755
--- a/bin/9l
+++ b/bin/9l
@@ -9,7 +9,7 @@ verbose=false
 
 nmflags=""
 extralibs="-lm"
-tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
+tag="${SYSNAME:-`uname`}"
 case "$tag" in
 *DragonFly*|*BSD*)
 	ld="${CC9:-gcc} $CC9FLAGS"
@@ -27,14 +27,8 @@ case "$tag" in
 	userpath=true
 	extralibs="$extralibs -lutil -lresolv -lpthread"
 	;;
-*Darwin*x86_64*)
-	ld="${CC9:-gcc} -m64 $CC9FLAGS"
-	;;
-*Darwin-arm64*)
-	ld="${CC9:-gcc} -m64 $CC9FLAGS"
-	;;
 *Darwin*)
-	ld="${CC9:-gcc} -m32 $CC9FLAGS"
+	ld="${CC9:-gcc} -m64 $CC9FLAGS"
 	;;
 *SunOS*)
 	ld="${CC9:-cc} -g $CC9FLAGS"
@@ -255,7 +249,7 @@ then
 		fi
 		# Don't say -L with a non-existent directory: Xcode complains.
 		# x86_64 seems to put its 64-bit libraries in lib64.
-		if [ "${OBJTYPE:-`uname -m`}" = "x86_64" -a -d "$X11/lib64" ]
+		if [ "`uname -m`" = "x86_64" -a -d "$X11/lib64" ]
 		then
 			libsl="$libsl -L$X11/lib64"
 		fi
-- 
cgit v1.2.3