wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 973646 - Port some CXXFLAGS logic in js/src/Makefile.in to the DEFINES variable; r=glandium

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-02-18 01:10:22 -05:00
parent 4efa004f11
commit 0833d615ed
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/Makefile.in
View File

@ -404,23 +404,6 @@ selfhosted.out.h: $(selfhosted_out_h_deps)
$(PYTHON) $(srcdir)/builtin/embedjs.py $(SELFHOSTED_DEFINES) \
-p '$(CPP)' -m $(srcdir)/js.msg -o $@ $(selfhosting_srcs)
###############################################
# BEGIN kludges for the Nitro assembler
#
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
ifneq (,$(ENABLE_YARR_JIT))
CXXFLAGS += -DENABLE_JIT=1
endif
#
# END kludges for the Nitro assembler
###############################################
###############################################
# Generating source package tarballs
# (only possible when tar is found)

9
js/src/moz.build
View File

@ -441,3 +441,12 @@ if CONFIG['_MSC_VER']:
SOURCES['builtin/RegExp.cpp'].no_pgo = True # Bug 772303
elif CONFIG['CPU_ARCH'] == 'x86_64' and CONFIG['JS_HAS_CTYPES']:
SOURCES['ctypes/CTypes.cpp'].no_pgo = True # Bug 810661
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
DEFINES['USE_SYSTEM_MALLOC'] = 1
DEFINES['ENABLE_ASSEMBLER'] = 1
if CONFIG['ENABLE_YARR_JIT']:
DEFINES['ENABLE_JIT'] = 1