commit - e42c27297abd4cb00704b9d0e7a3401114d34ebf
commit + 5d03af6557cc215cabc0f83a274d9add703f526e
blob - 68d099e39982b0162a7a288c20fb227a4a5c5c38
blob + 864b2f1f1761278a85b9c2e81a5ce2c5a7c9ed8b
--- bin/9l
+++ 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
blob - 9d657b19be11a015c391c5620184fa1c6f9353bf
blob + 088b98f848935ad3ee0848bcd89e4d3f25a5fcb2
--- src/cmd/acid/expr.c
+++ src/cmd/acid/expr.c
@@ -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");
blob - 27b6b3ce237e2e6087d56d3864d3a87ed40ebfd7
blob + 3d23062e94139cfdc8e9857ad7c577aa3b3361fe
--- src/cmd/fontsrv/mkfile
+++ src/cmd/fontsrv/mkfile
@@ -11,4 +11,4 @@ OFILES=\
 
 <$PLAN9/src/mkone
 
-
+osx-cocoa.$O: osx.c
blob - /dev/null
blob + 0e36b6e851fcde5a8f60b5f422f6d354a3e5e35a (mode 644)
--- /dev/null
+++ src/cmd/fontsrv/osx-cocoa.c
@@ -0,0 +1 @@
+#include "osx.c"
blob - 6a06e3e2e348c8fa5c25cb553fc0cb3d77f30a50
blob + ece63311e9d9070f88c315f76bc34874dd2589b0
--- src/cmd/venti/srv/mkfile
+++ src/cmd/venti/srv/mkfile
@@ -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'
blob - 5367d96692ccf69d64f6f0597373dbe3e1f48c3e
blob + c208829bce630642330f0b6843f5fbe5fbcfef8b
--- src/cmd/venti/srv/printarenapart.c
+++ src/cmd/venti/srv/printarenapart.c
@@ -11,7 +11,8 @@ usage(void)
 	threadexitsall("usage");
 }
 
-static void
+/* unused */
+void
 rdarena(Arena *arena, u64int offset)
 {
 	u64int a, aa, e;
blob - 103ffe55729afeabf67e052a42dfd7ecf878fe79
blob + 8c1f74548a3cd95768c9225ffd899ad98828b64e
--- src/mkfile
+++ src/mkfile
@@ -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\