diff options
| author | Jay Freeman <saurik@saurik.com> | 2008-04-06 10:28:29 +0000 |
|---|---|---|
| committer | Jay Freeman <saurik@saurik.com> | 2008-04-06 10:28:29 +0000 |
| commit | d699a01fabaa04a1aad60f6ca5777f82ee24839a (patch) | |
| tree | 1eb62bad23b14a0877c5b9171f2a5f9358c8d592 /data/spidermonkey | |
| parent | 8a49e427447f40fdd43fc4b5f513b166dd639e2a (diff) | |
Drastic, sweeping modifications to support iPhone 1.2.0/2.0.
git-svn-id: http://svn.telesphoreo.org/trunk@199 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'data/spidermonkey')
| -rw-r--r-- | data/spidermonkey/port.diff | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/data/spidermonkey/port.diff b/data/spidermonkey/port.diff index 51dcfee37..29b00a974 100644 --- a/data/spidermonkey/port.diff +++ b/data/spidermonkey/port.diff @@ -1,22 +1,33 @@ diff -ru js/src/config/Darwin.mk js+iPhone/src/config/Darwin.mk --- js/src/config/Darwin.mk 2007-02-05 16:24:49.000000000 +0000 -+++ js+iPhone/src/config/Darwin.mk 2007-12-31 21:06:50.000000000 +0000 -@@ -43,12 +43,12 @@ ++++ js+iPhone/src/config/Darwin.mk 2008-04-05 05:47:23.000000000 +0000 +@@ -43,13 +43,13 @@ # Just ripped from Linux config # -CC = cc -CCC = g++ -+CC = arm-apple-darwin-gcc -+CCC = arm-apple-darwin-g++ ++CC = $${PKG_TARG}-gcc ++CCC = $${PKG_TARG}-g++ CFLAGS += -Wall -Wno-format OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN -RANLIB = ranlib -+RANLIB = arm-apple-darwin-ranlib - MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) -framework System +-MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) -framework System ++RANLIB = $${PKG_TARG}-ranlib ++MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) SO_SUFFIX = dylib + +@@ -63,7 +63,7 @@ + endif + GFX_ARCH = x + +-OS_LIBS = -lc -framework System ++OS_LIBS = -lc + + ASFLAGS += -x assembler-with-cpp + @@ -81,3 +81,4 @@ # Don't allow Makefile.ref to use libmath NO_LIBM = 1 @@ -73,15 +84,6 @@ diff -ru js/src/jsnum.c js+iPhone/src/jsnum.c diff -ru js/src/Makefile.ref js+iPhone/src/Makefile.ref --- js/src/Makefile.ref 2006-07-26 19:16:47.000000000 +0000 +++ js+iPhone/src/Makefile.ref 2007-12-31 21:07:20.000000000 +0000 -@@ -82,7 +82,7 @@ - # - # XCFLAGS may be set in the environment or on the gmake command line - # --CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) -+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) -O0 - - LDFLAGS = $(XLDFLAGS) - @@ -320,10 +320,10 @@ $(OBJDIR)/jskwgen.o: jskwgen.c jskeyword.tbl |