|
Check-in Number:
|
5587 | |
| Date: |
2005-Jun-01 16:26:26 (local)
2005-Jun-01 14:26:26 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
Import new upstream version: Mozilla JavaScript (SpiderMonkey) 1.6 as of 2006-07-24 |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/js/src/Makefile.in 1.1.1.1 -> 1.1.1.2
--- Makefile.in 2006/06/12 21:36:07 1.1.1.1
+++ Makefile.in 2005/06/01 14:26:26 1.1.1.2
@@ -368,35 +368,16 @@
# the mdcpucfg for the target so it needs the appropriate target defines
ifdef HOST_NSPR_MDCPUCFG
HOST_CC := $(HOST_CC) -DMDCPUCFG=$(TARGET_NSPR_MDCPUCFG)
-HOST_CFLAGS := $(patsubst -DXP_%,,$(HOST_CFLAGS))
-endif
-
-ifdef CROSS_COMPILE
-# jscpucfg needs to know when it's supposed to produce a config for the target
-JSCPUCFG_DEFINES = $(ACDEFINES)
-
-# This is incredibly hacky. Darwin NSPR uses the same MDCPUCFG for multiple
-# processors, and determines which processor to configure for based on
-# #ifdef i386. This macro is among the NSPR defines, but is also automatically
-# defined by the compiler when building for i386. It therefore needs to be
-# defined here if targeting i386, and explicitly undefined otherwise.
-ifeq ($(OS_ARCH),Darwin)
-ifeq ($(TARGET_CPU),powerpc)
-JSCPUCFG_DEFINES += -Ui386
-else
-JSCPUCFG_DEFINES += -Di386=1
-endif
-endif
endif
ifeq ($(OS_ARCH),QNX)
ifneq ($(OS_TARGET),NTO)
# QNX's compiler apparently can't build a binary directly from a source file.
jscpucfg.o: jscpucfg.c Makefile.in
- $(HOST_CC) $(HOST_CFLAGS) -c $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) -o $@ $<
+ $(HOST_CC) $(HOST_CFLAGS) -c $(DEFINES) $(NSPR_CFLAGS) -o $@ $<
jscpucfg: jscpucfg.o
- $(HOST_CC) $(HOST_CFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) -o $@ $<
+ $(HOST_CC) $(HOST_CFLAGS) $(DEFINES) -o $@ $<
endif
else
ifeq ($(OS_ARCH),WINCE)
@@ -404,7 +385,7 @@
echo no need to build jscpucfg $<
else
jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.c Makefile.in
- $(HOST_CC) $(HOST_CFLAGS) $(JSCPUCFG_DEFINES) $(DEFINES) $(NSPR_CFLAGS) $(OUTOPTION)$@ $<
+ $(HOST_CC) $(HOST_CFLAGS) $(DEFINES) $(NSPR_CFLAGS) $(OUTOPTION)$@ $<
endif
endif
|
|
