Index: /trunk/source/lisp-kernel/darwinx8632/Makefile
===================================================================
--- /trunk/source/lisp-kernel/darwinx8632/Makefile	(revision 14674)
+++ /trunk/source/lisp-kernel/darwinx8632/Makefile	(revision 14675)
@@ -17,4 +17,9 @@
 SVN_REVISION=$(shell svnversion || echo "unknown")
 
+SDKROOT=/Developer/SDKs/MacOSX10.5.sdk
+OSVERSION=10.5
+#SDKROOT=/Developer/SDKs/MacOSX10.6.sdk
+#OSVERSION=10.6
+
 MDYNAMIC_NO_PIC = $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-no-pic") && /bin/echo "-mdynamic-no-pic")
 
@@ -22,10 +27,10 @@
 RM = /bin/rm
 LD = ld
-LDFLAGS =  -macosx_version_min 10.5 -arch i386 -dynamic  -o $@ -e start -pagezero_size 0x11000 -seg1addr 0x00011000 -sectalign __TEXT __text 0x1000 
+LDFLAGS =  -macosx_version_min $(OSVERSION) -arch i386 -dynamic  -o $@ -e start -pagezero_size 0x11000 -seg1addr 0x00011000 -sectalign __TEXT __text 0x1000 
 AS = as
 M4 = gm4
 M4FLAGS = -DDARWIN -DX86 -DX8632
 ASFLAGS = -arch i386 -g
-CDEFINES = -DDARWIN -DX86 -DX8632 -DSVN_REVISION=$(SVN_REVISION)
+CDEFINES = -DDARWIN -DX86 -DX8632 -DSVN_REVISION=$(SVN_REVISION) -D_DARWIN_NO_64_BIT_INODE
 CDEBUG = -g
 COPT = -O2
@@ -33,5 +38,5 @@
 # however.
 WFORMAT = -Wno-format
-CC=gcc-4.0
+CC=cc
 PLATFORM_H = platform-darwinx8632.h
 
@@ -39,5 +44,5 @@
 	$(M4) $(M4FLAGS) -I../ $< | $(AS) $(ASFLAGS) -o $@
 .c.o:
-	$(CC) -include ../$(PLATFORM_H) -c -arch i386 $< $(CDEFINES) $(CDEBUG) $(COPT) $(MDYNAMIC_NO_PIC) $(WFORMAT) -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -o $@
+	$(CC) -include ../$(PLATFORM_H) -c -arch i386 $< $(CDEFINES) $(CDEBUG) $(COPT) $(MDYNAMIC_NO_PIC) $(WFORMAT) -mmacosx-version-min=$(OSVERSION) -isysroot $(SDKROOT) -o $@
 
 SPOBJ = x86-spjump32.o x86-spentry32.o x86-subprims32.o
Index: /trunk/source/lisp-kernel/darwinx8664/Makefile
===================================================================
--- /trunk/source/lisp-kernel/darwinx8664/Makefile	(revision 14674)
+++ /trunk/source/lisp-kernel/darwinx8664/Makefile	(revision 14675)
@@ -15,6 +15,10 @@
 
 
+SVN_REVISION=$(shell svnversion || echo "unknown")
 
-SVN_REVISION=$(shell svnversion || echo "unknown")
+SDKROOT=/Developer/SDKs/MacOSX10.5.sdk
+OSVERSION=10.5
+#SDKROOT=/Developer/SDKs/MacOSX10.6.sdk
+#OSVERSION=10.6
 
 MDYNAMIC_NO_PIC = $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-no-pic") && /bin/echo "-mdynamic-no-pic")
@@ -23,10 +27,10 @@
 VPATH = ..
 RM = /bin/rm
-CC=gcc-4.0
+CC=cc
 
 ### Current ld64 bugs include the claim that 0x1000 isn't a power of 2.
 ### Gosh.  I always thought that it was.  Go know, right ?
-LDFLAGS = -macosx_version_min 10.5 -arch x86_64 -dynamic  -o $@ -e start -pagezero_size 0x11000 -seg1addr 0x00011000
-
+LDFLAGS = -macosx_version_min $(OSVERSION) -arch x86_64 -dynamic \
+	  -o $@ -e start -pagezero_size 0x11000 -seg1addr 0x00011000
 
 AS = as
@@ -49,5 +53,6 @@
 M4FLAGS = -DDARWIN -DX86 -DX8664 -DTCR_IN_GPR
 ASFLAGS = -arch x86_64 -g
-CDEFINES = -DDARWIN -DX86 -DX8664 -DTCR_IN_GPR -DSVN_REVISION=$(SVN_REVISION)
+CDEFINES = -DDARWIN -DX86 -DX8664 -DTCR_IN_GPR -DSVN_REVISION=$(SVN_REVISION) \
+	   -D_DARWIN_NO_64_BIT_INODE
 CDEBUG = -g
 COPT = -O2
@@ -60,5 +65,7 @@
 	$(M4) $(M4FLAGS) -I../ $< | $(AS) $(ASFLAGS) -o $@
 .c.o:
-	$(CC) -include ../$(PLATFORM_H) -c $< -arch x86_64 $(CDEFINES) $(CDEBUG) $(COPT) $(WFORMAT) $(MDYNAMIC_NO_PIC) -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk -o $@
+	$(CC) -include ../$(PLATFORM_H) -c $< -arch x86_64 $(CDEFINES) \
+	$(CDEBUG) $(COPT) $(WFORMAT) $(MDYNAMIC_NO_PIC) \
+	 -mmacosx-version-min=$(OSVERSION) -isysroot $(SDKROOT) -o $@
 
 SPOBJ = x86-spjump64.o x86-spentry64.o x86-subprims64.o