summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--Makefile.config5
2 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index e4bedea171..a851787c16 100644
--- a/Makefile
+++ b/Makefile
@@ -323,12 +323,8 @@ cvs-fix-perms :
INSTALL_PREFIX=$(PROJECT_BOOTSTRAPDIR) \
PROJECT_BINARYDIR=$(PROJECT_BOOTSTRAPDIR)/bin \
PROJECT_OUTPUTDIR=$(PROJECT_BOOTSTRAPDIR)/classes \
- LIBRARY_SCALAC=$(PROJECT_BOOTSTRAPDIR)/bin/scalacboot \
- boot="bootstrap-" scripts lamplib \
- .latest-bootstrap-scalac-jc \
- .latest-bootstrap-library-jc \
- .latest-bootstrap-library-sc \
- .latest-bootstrap-scalac-sc;
+ LIBRARY_SCALAC=$(BOOTSTRAP_SCALAC) \
+ boot="bootstrap-" system;
touch $@
.latest-boottest :
diff --git a/Makefile.config b/Makefile.config
index 45bd184152..b6c8255c75 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -102,6 +102,11 @@ PICO ?= pico
PICO_FLAGS ?= -make -source 1.4
##############################################################################
+# Bootstrap compiler
+
+BOOTSTRAP_SCALAC ?= scalac
+
+##############################################################################
# XSLT processor
XSLTPROC ?= xsltproc