Bug 670719 - Only add -DENABLE_JIT=1 to CXXFLAGS if any of trace/method/yarr jit is enabled. r=dmandelin

This commit is contained in:
Mike Hommey 2011-08-23 16:13:21 +02:00
Родитель 49b43ec341
Коммит d15e86aa9a
1 изменённых файлов: 8 добавлений и 1 удалений

Просмотреть файл

@ -438,6 +438,9 @@ else
############################################### ###############################################
# BEGIN include sources for the Nitro assembler # BEGIN include sources for the Nitro assembler
# #
ENABLE_YARR_JIT = 1
VPATH += $(srcdir)/assembler \ VPATH += $(srcdir)/assembler \
$(srcdir)/assembler/wtf \ $(srcdir)/assembler/wtf \
$(srcdir)/assembler/jit \ $(srcdir)/assembler/jit \
@ -1081,7 +1084,11 @@ endif
# Needed to "configure" it correctly. Unfortunately these # Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just # flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler. # the code in js/src/assembler.
CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
CXXFLAGS += -DENABLE_JIT=1
endif
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr