diff options
| author | Russ Cox <rsc@swtch.com> | 2020-12-30 07:39:16 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2020-12-30 07:53:28 -0500 |
| commit | 99dee78c2d44641ba56e5bb640d732f993b3dfa1 (patch) | |
| tree | 3e785ab1037b96d4eb2dc321925bc0733332cea8 /bin/9l | |
| parent | 0bd14783426d137428ffae7cd89cfc06b88d1b11 (diff) | |
| download | plan9port-99dee78c2d44641ba56e5bb640d732f993b3dfa1.tar.gz plan9port-99dee78c2d44641ba56e5bb640d732f993b3dfa1.tar.bz2 plan9port-99dee78c2d44641ba56e5bb640d732f993b3dfa1.zip | |
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.
Diffstat (limited to 'bin/9l')
| -rwxr-xr-x | bin/9l | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -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 |