1.1 --- a/makefiles/BuildNashorn.gmk Mon Feb 25 16:51:04 2013 +0100
1.2 +++ b/makefiles/BuildNashorn.gmk Tue Feb 26 22:57:51 2013 +0530
1.3 @@ -57,10 +57,13 @@
1.4 COPY:=.properties .js,\
1.5 BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes))
1.6
1.7 +NASGEN_SRC := $(FIXPATH) $(NASHORN_TOPDIR)/buildtools/nasgen/src
1.8 +ASM_SRC := $(FIXPATH) $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
1.9 +
1.10 # Build nasgen
1.11 $(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
1.12 SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
1.13 - SRC:=$(NASHORN_TOPDIR)/buildtools/nasgen/src,\
1.14 + SRC:=$(NASGEN_SRC) $(ASM_SRC), \
1.15 BIN:=$(NASHORN_OUTPUTDIR)/nasgen_classes,\
1.16 ADD_JAVAC_FLAGS:=-cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
1.17
1.18 @@ -74,7 +77,7 @@
1.19 $(MKDIR) -p $(@D)
1.20 $(RM) -rf $(@D)/jdk $(@D)/netscape
1.21 $(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
1.22 - $(FIXPATH) $(JDK_OUTPUTDIR)/bin/java \
1.23 + $(FIXPATH) $(JAVA) \
1.24 -cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
1.25 jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
1.26 for f in `$(FIND) $(@D)/jdk/nashorn/internal/objects/ -name "*.class"`; do \
