fix INSTALL warnings

R=rsc
http://codereview.appspot.com/6258060
This commit is contained in:
Russ Cox 2012-05-29 15:11:14 -04:00
parent e42c27297a
commit 5d03af6557
7 changed files with 12 additions and 7 deletions

9
bin/9l
View file

@ -268,12 +268,17 @@ then
then then
X11=/usr/X11R6 X11=/usr/X11R6
fi fi
# Don't say -L with a non-existent directory: Xcode complains.
# x86_64 seems to put its 64-bit libraries in lib64. # x86_64 seems to put its 64-bit libraries in lib64.
if [ "${OBJTYPE:-`uname -m`}" = "x86_64" ] if [ "${OBJTYPE:-`uname -m`}" = "x86_64" -a -d "$X11/lib64" ]
then then
libsl="$libsl -L$X11/lib64" libsl="$libsl -L$X11/lib64"
fi fi
libsl="$libsl -L$X11/lib -lX11" if [ -d "$X11/lib" ]
then
libsl="$libsl -L$X11/lib"
fi
libsl="$libsl -lX11"
fi fi
fi fi
if $doautoframework if $doautoframework

View file

@ -1076,7 +1076,6 @@ acidregsrw(Regs *r, char *name, u64int *u, int isr)
Value *v; Value *v;
Node *n; Node *n;
u64int addr; u64int addr;
u32int u32;
if(!isr){ if(!isr){
werrstr("cannot write registers"); werrstr("cannot write registers");

View file

@ -11,4 +11,4 @@ OFILES=\
<$PLAN9/src/mkone <$PLAN9/src/mkone
osx-cocoa.$O: osx.c

View file

@ -0,0 +1 @@
#include "osx.c"

View file

@ -89,7 +89,7 @@ $SLIB: $LIBOFILES
acid:D: lumpcache.acid acid:D: lumpcache.acid
cat $prereq >$target cat $prereq >$target
$O.conf:D: conf.rc $O.conf:DQ: conf.rc
{ {
echo '#!/usr/local/plan9/bin/rc' echo '#!/usr/local/plan9/bin/rc'
echo '# THIS FILE IS AUTOMATICALLY GENERATED' echo '# THIS FILE IS AUTOMATICALLY GENERATED'

View file

@ -11,7 +11,8 @@ usage(void)
threadexitsall("usage"); threadexitsall("usage");
} }
static void /* unused */
void
rdarena(Arena *arena, u64int offset) rdarena(Arena *arena, u64int offset)
{ {
u64int a, aa, e; u64int a, aa, e;

View file

@ -16,7 +16,6 @@ libs-%:V:
do do
(cd $i; echo cd `pwd`';' mk $MKFLAGS $stem; mk $MKFLAGS $stem) (cd $i; echo cd `pwd`';' mk $MKFLAGS $stem; mk $MKFLAGS $stem)
done done
[ "$SYSNAME" != Darwin ] || ranlib ../lib/*.a
MKDIRS=\ MKDIRS=\
libbio\ libbio\