This is another patch to get jdk8/tl building again after the Nashorn
build changes.
The changes for 8009021 [1] that were pushed to jdk8/tl/nashorn
yesterday break the build on Windows. The problem is that NASGEN_SRC and
ASM_SRC shouldn't have $(FIXPATH) in the value. Kudos to David Holmes
for identifying the problem. I've removed the $(FIXPATH) and verified
that jdk8/tl builds on all platforms again. I'd like to get this into
jdk8/tl today.
-Alan
[1] http://hg.openjdk.java.net/jdk8/tl/nashorn/rev/a90094ae5be3
diff --git a/makefiles/BuildNashorn.gmk b/makefiles/BuildNashorn.gmk
--- a/makefiles/BuildNashorn.gmk
+++ b/makefiles/BuildNashorn.gmk
@@ -57,8 +57,8 @@
COPY:=.properties .js,\
BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes))
-NASGEN_SRC := $(FIXPATH) $(NASHORN_TOPDIR)/buildtools/nasgen/src
-ASM_SRC := $(FIXPATH)
$(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
+NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
+ASM_SRC := $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
# Build nasgen
$(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
