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 667962 Try to make jemalloc build with gmake as well as pymake r=khuey

Browse Source
This commit is contained in:
Neil Rashbrook 2011-07-27 20:24:11 +01:00
parent c0be20af05
commit 6419f03642
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
memory/jemalloc/Makefile.in
View File

@ -211,37 +211,35 @@ ifndef WIN32_OLD_STYLE_JEMALLOC
# #
############################################################################### ###############################################################################
libs:: $(DIST)/lib/mozcrt.lib libs:: mozcrt.lib
$(DIST)/lib/mozcrt.lib:: mozcrt.lib
$(INSTALL) $(IFLAGS2) mozcrt.lib $(DIST)/lib $(INSTALL) $(IFLAGS2) mozcrt.lib $(DIST)/lib
# And finally combine that with the jemalloc import library to get an import # And finally combine that with the jemalloc import library to get an import
# library that has our malloc/free/etc and the CRT's everything else # library that has our malloc/free/etc and the CRT's everything else
mozcrt.lib:: $(IMPORT_LIBRARY) msvc_modified.lib mozcrt.lib: $(IMPORT_LIBRARY) msvc_modified.lib
lib -OUT:$@ $^ lib -OUT:$@ $^
# Put the fixed object file back in # Put the fixed object file back in
msvc_modified.lib:: msvc_removed.lib crtdll_fixed.obj msvc_modified.lib: msvc_removed.lib crtdll_fixed.obj
lib -OUT:$@ $^ lib -OUT:$@ $^
# Fix the object file # Fix the object file
crtdll_fixed.obj:: crtdll.obj crtdll_fixed.obj: crtdll.obj
$(PYTHON) $(srcdir)/fixcrt.py $(PYTHON) $(srcdir)/fixcrt.py
# Find the path of crtdll.obj # Find the path of crtdll.obj
CRTDLL_FULLPATH=$(subst \,\\,$(shell lib -list msvc_combined.lib | grep crtdll\\.obj)) CRTDLL_FULLPATH=$(subst \,\\,$(shell lib -list msvc_combined.lib | grep crtdll\\.obj))
# Remove the broken object file, only after we have extracted it # Remove the broken object file, only after we have extracted it
msvc_removed.lib:: msvc_combined.lib crtdll.obj msvc_removed.lib: msvc_combined.lib crtdll.obj
lib -OUT:$@ msvc_combined.lib -REMOVE:$(CRTDLL_FULLPATH) lib -OUT:$@ msvc_combined.lib -REMOVE:$(CRTDLL_FULLPATH)
# Extract the broken object file out of the combined library # Extract the broken object file out of the combined library
crtdll.obj:: msvc_combined.lib crtdll.obj: msvc_combined.lib
lib -OUT:$@ $^ -EXTRACT:$(CRTDLL_FULLPATH) lib -OUT:$@ $^ -EXTRACT:$(CRTDLL_FULLPATH)
# Grab both CRT libraries and combine them into one library to simplify things # Grab both CRT libraries and combine them into one library to simplify things
msvc_combined.lib:: msvc_combined.lib:
lib -OUT:$@ $(WIN32_CRT_LIBS) lib -OUT:$@ $(WIN32_CRT_LIBS)
endif endif