Permalink
Browse files

Merge remote-tracking branch 'csoren/embed-fix'

  • Loading branch information...
2 parents 2c902a2 + 43f41f6 commit 45e4a6b0227dbe80c08262e4aba53e3f8e67453b U-JDICEVM7\Joel committed Apr 10, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 makefile
View
@@ -1042,7 +1042,7 @@ target-asm = $(asm)
build-embed = $(build)/embed
build-embed-loader = $(build)/embed-loader
-embed-loader-sources = $(src)/embedded-loader.cpp $(stub-sources)
+embed-loader-sources = $(src)/embedded-loader.cpp
embed-loader-objects = $(call cpp-objects,$(embed-loader-sources),$(src),$(build-embed-loader))
embed-sources = $(src)/embed.cpp
@@ -1582,7 +1582,7 @@ $(embed-loader-o): $(embed-loader) $(converter)
$(converter) $(<) $(@) _binary_loader_start \
_binary_loader_end $(target-format) $(arch)
-$(embed-loader): $(embed-loader-objects) $(vm-objects) $(classpath-object) \
+$(embed-loader): $(embed-loader-objects) $(vm-objects) $(classpath-objects) \
$(heapwalk-objects) $(lzma-decode-objects)
ifdef ms_cl_compiler
$(ld) $(lflags) $(^) -out:$(@) \

0 comments on commit 45e4a6b

Please sign in to comment.