parent
e42c27297a
commit
5d03af6557
7 changed files with 12 additions and 7 deletions
9
bin/9l
9
bin/9l
|
|
@ -268,12 +268,17 @@ then
|
|||
then
|
||||
X11=/usr/X11R6
|
||||
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" ]
|
||||
if [ "${OBJTYPE:-`uname -m`}" = "x86_64" -a -d "$X11/lib64" ]
|
||||
then
|
||||
libsl="$libsl -L$X11/lib64"
|
||||
fi
|
||||
libsl="$libsl -L$X11/lib -lX11"
|
||||
if [ -d "$X11/lib" ]
|
||||
then
|
||||
libsl="$libsl -L$X11/lib"
|
||||
fi
|
||||
libsl="$libsl -lX11"
|
||||
fi
|
||||
fi
|
||||
if $doautoframework
|
||||
|
|
|
|||
|
|
@ -1076,7 +1076,6 @@ acidregsrw(Regs *r, char *name, u64int *u, int isr)
|
|||
Value *v;
|
||||
Node *n;
|
||||
u64int addr;
|
||||
u32int u32;
|
||||
|
||||
if(!isr){
|
||||
werrstr("cannot write registers");
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@ OFILES=\
|
|||
|
||||
<$PLAN9/src/mkone
|
||||
|
||||
|
||||
osx-cocoa.$O: osx.c
|
||||
|
|
|
|||
1
src/cmd/fontsrv/osx-cocoa.c
Normal file
1
src/cmd/fontsrv/osx-cocoa.c
Normal file
|
|
@ -0,0 +1 @@
|
|||
#include "osx.c"
|
||||
|
|
@ -89,7 +89,7 @@ $SLIB: $LIBOFILES
|
|||
acid:D: lumpcache.acid
|
||||
cat $prereq >$target
|
||||
|
||||
$O.conf:D: conf.rc
|
||||
$O.conf:DQ: conf.rc
|
||||
{
|
||||
echo '#!/usr/local/plan9/bin/rc'
|
||||
echo '# THIS FILE IS AUTOMATICALLY GENERATED'
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@ usage(void)
|
|||
threadexitsall("usage");
|
||||
}
|
||||
|
||||
static void
|
||||
/* unused */
|
||||
void
|
||||
rdarena(Arena *arena, u64int offset)
|
||||
{
|
||||
u64int a, aa, e;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ libs-%:V:
|
|||
do
|
||||
(cd $i; echo cd `pwd`';' mk $MKFLAGS $stem; mk $MKFLAGS $stem)
|
||||
done
|
||||
[ "$SYSNAME" != Darwin ] || ranlib ../lib/*.a
|
||||
|
||||
MKDIRS=\
|
||||
libbio\
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue