Changeset 14675


Ignore:
Timestamp:
Mar 14, 2011, 10:56:00 AM (14 years ago)
Author:
R. Matthew Emerson
Message:

Change the darwinx86 makefiles so that it's easy to edit them
and build against the 10.6 SDK, as required by the Xcode 4 tools
(which don't include a 10.5 SDK).

Slight voodoo note: we now always define -D_DARWIN_NO_64_BIT_INODE.
See the stat(2) man page for some details about this.

Location:
trunk/source/lisp-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/lisp-kernel/darwinx8632/Makefile

    r14584 r14675  
    1717SVN_REVISION=$(shell svnversion || echo "unknown")
    1818
     19SDKROOT=/Developer/SDKs/MacOSX10.5.sdk
     20OSVERSION=10.5
     21#SDKROOT=/Developer/SDKs/MacOSX10.6.sdk
     22#OSVERSION=10.6
     23
    1924MDYNAMIC_NO_PIC = $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-no-pic") && /bin/echo "-mdynamic-no-pic")
    2025
    … …  
    2227RM = /bin/rm
    2328LD = ld
    24 LDFLAGS =  -macosx_version_min 10.5 -arch i386 -dynamic  -o $@ -e start -pagezero_size 0x11000 -seg1addr 0x00011000 -sectalign __TEXT __text 0x1000
     29LDFLAGS =  -macosx_version_min $(OSVERSION) -arch i386 -dynamic  -o $@ -e start -pagezero_size 0x11000 -seg1addr 0x00011000 -sectalign __TEXT __text 0x1000
    2530AS = as
    2631M4 = gm4
    2732M4FLAGS = -DDARWIN -DX86 -DX8632
    2833ASFLAGS = -arch i386 -g
    29 CDEFINES = -DDARWIN -DX86 -DX8632 -DSVN_REVISION=$(SVN_REVISION)
     34CDEFINES = -DDARWIN -DX86 -DX8632 -DSVN_REVISION=$(SVN_REVISION) -D_DARWIN_NO_64_BIT_INODE
    3035CDEBUG = -g
    3136COPT = -O2
    … …  
    3338# however.
    3439WFORMAT = -Wno-format
    35 CC=gcc-4.0
     40CC=cc
    3641PLATFORM_H = platform-darwinx8632.h
    3742
    … …  
    3944        $(M4) $(M4FLAGS) -I../ $< | $(AS) $(ASFLAGS) -o $@
    4045.c.o:
    41         $(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 $@
     46        $(CC) -include ../$(PLATFORM_H) -c -arch i386 $< $(CDEFINES) $(CDEBUG) $(COPT) $(MDYNAMIC_NO_PIC) $(WFORMAT) -mmacosx-version-min=$(OSVERSION) -isysroot $(SDKROOT) -o $@
    4247
    4348SPOBJ = x86-spjump32.o x86-spentry32.o x86-subprims32.o

  • trunk/source/lisp-kernel/darwinx8664/Makefile

    r14584 r14675  
    1515
    1616
     17SVN_REVISION=$(shell svnversion || echo "unknown")
    1718
    18 SVN_REVISION=$(shell svnversion || echo "unknown")
     19SDKROOT=/Developer/SDKs/MacOSX10.5.sdk
     20OSVERSION=10.5
     21#SDKROOT=/Developer/SDKs/MacOSX10.6.sdk
     22#OSVERSION=10.6
    1923
    2024MDYNAMIC_NO_PIC = $(shell ($(CC) --help -v 2>&1 | grep -q -e "-mdynamic-no-pic") && /bin/echo "-mdynamic-no-pic")
    … …  
    2327VPATH = ..
    2428RM = /bin/rm
    25 CC=gcc-4.0
     29CC=cc
    2630
    2731### Current ld64 bugs include the claim that 0x1000 isn't a power of 2.
    2832### Gosh.  I always thought that it was.  Go know, right ?
    29 LDFLAGS = -macosx_version_min 10.5 -arch x86_64 -dynamic  -o $@ -e start -pagezero_size 0x11000 -seg1addr 0x00011000
    30 
     33LDFLAGS = -macosx_version_min $(OSVERSION) -arch x86_64 -dynamic \
     34          -o $@ -e start -pagezero_size 0x11000 -seg1addr 0x00011000
    3135
    3236AS = as
    … …  
    4953M4FLAGS = -DDARWIN -DX86 -DX8664 -DTCR_IN_GPR
    5054ASFLAGS = -arch x86_64 -g
    51 CDEFINES = -DDARWIN -DX86 -DX8664 -DTCR_IN_GPR -DSVN_REVISION=$(SVN_REVISION)
     55CDEFINES = -DDARWIN -DX86 -DX8664 -DTCR_IN_GPR -DSVN_REVISION=$(SVN_REVISION) \
     56           -D_DARWIN_NO_64_BIT_INODE
    5257CDEBUG = -g
    5358COPT = -O2
    … …  
    6065        $(M4) $(M4FLAGS) -I../ $< | $(AS) $(ASFLAGS) -o $@
    6166.c.o:
    62         $(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 $@
     67        $(CC) -include ../$(PLATFORM_H) -c $< -arch x86_64 $(CDEFINES) \
     68        $(CDEBUG) $(COPT) $(WFORMAT) $(MDYNAMIC_NO_PIC) \
     69         -mmacosx-version-min=$(OSVERSION) -isysroot $(SDKROOT) -o $@
    6370
    6471SPOBJ = x86-spjump64.o x86-spentry64.o x86-subprims64.o
Note: See TracChangeset for help on using the changeset viewer.