diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -82,7 +82,7 @@ SCALAC_JC_FILES += $(SCALACBOOT_SOURCES) SCALAC_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(MSIL_JARFILE):$(FJBG_JARFILE) SCALAC_SC_FILES += $(SCALAC_SOURCES) SCALAC_SC_CLASSPATH = $(SCALAC_JC_CLASSPATH) -SCALAC_SCALAC = $(SCALAC:$(PROJECT_ROOT)%=$(PROJECT_BOOTSTRAPDIR)%)boot +SCALAC_SCALAC = $(LIBRARY_SCALAC) # scala library LIBRARY_ROOT = $(PROJECT_SOURCEDIR)/scala @@ -97,7 +97,7 @@ LIBRARY_SDC_OUTPUTDIR = $(PROJECT_APIDOCDIR) LIBRARY_JAR_ARCHIVE = $(PROJECT_LIBRARYDIR)/$(PROJECT_NAME).jar LIBRARY_JAR_INPUTDIR = $(PROJECT_OUTPUTDIR) LIBRARY_JAR_FILES += scala -LIBRARY_SCALAC = $(if $(boot),$(SCALAC)boot,$(SCALAC_SCALAC)) +LIBRARY_SCALAC = $(PROJECT_BOOTSTRAPDIR)/bin/scalacboot # scala interpreter INTERPRETER_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scalai |