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.
This commit is contained in:
12
bin/9l
12
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
|
||||
|
||||
Reference in New Issue
Block a user