ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-04 04:04:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix windows embed-loader build

Browse Source
This commit is contained in:
Joshua Warner 2013-03-01 14:52:27 -07:00
parent add029ad3c
commit df23c379bf
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
makefile
View File

@ -1564,19 +1564,18 @@ $(embed-loader-o): $(embed-loader) $(converter)
$(converter) $(<) $(@) _binary_loader_start \ $(converter) $(<) $(@) _binary_loader_start \
_binary_loader_end $(target-format) $(arch) _binary_loader_end $(target-format) $(arch)
$(embed-loader): $(embed-loader-objects) $(static-library) $(embed-loader): $(embed-loader-objects) $(vm-objects) $(classpath-objects) $(vm-heapwalk-objects) \
@mkdir -p $(dir $(@)) $(javahome-object) $(boot-javahome-object) $(lzma-decode-objects)
cd $(dir $(@)) && $(ar) x ../../../$(static-library)
ifdef ms_cl_compiler ifdef ms_cl_compiler
$(ld) $(lflags) $(dir $(@))/*.o -out:$(@) \ $(ld) $(lflags) $(^) -out:$(@) \
-debug -PDB:$(subst $(exe-suffix),.pdb,$(@)) $(manifest-flags) -debug -PDB:$(subst $(exe-suffix),.pdb,$(@)) $(manifest-flags)
ifdef mt ifdef mt
$(mt) -nologo -manifest $(@).manifest -outputresource:"$(@);1" $(mt) -nologo -manifest $(@).manifest -outputresource:"$(@);1"
endif endif
else else
$(dlltool) -z $(addsuffix .def,$(basename $(@))) $(dir $(@))/*.o $(dlltool) -z $(addsuffix .def,$(basename $(@))) $(^)
$(dlltool) -d $(addsuffix .def,$(basename $(@))) -e $(addsuffix .exp,$(basename $(@))) $(dlltool) -d $(addsuffix .def,$(basename $(@))) -e $(addsuffix .exp,$(basename $(@)))
$(ld) $(addsuffix .exp,$(basename $(@))) $(dir $(@))/*.o \ $(ld) $(addsuffix .exp,$(basename $(@))) $(^) \
$(lflags) $(bootimage-lflags) -o $(@) $(lflags) $(bootimage-lflags) -o $(@)
endif endif
$(strip) $(strip-all) $(@) $(strip) $(strip-all) $(@)