summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-11-20 14:40:25 +0000
committerpaltherr <paltherr@epfl.ch>2003-11-20 14:40:25 +0000
commitc69637585f3d084b73d492371b45f4ab178fd438 (patch)
treef139f1d62e13501fa7fca78bdd195b6d421aecd0 /Makefile
parent58657deaa23c84b640c2329d7ee308e3cee1d62b (diff)
downloadscala-c69637585f3d084b73d492371b45f4ab178fd438.tar.gz
scala-c69637585f3d084b73d492371b45f4ab178fd438.tar.bz2
scala-c69637585f3d084b73d492371b45f4ab178fd438.zip
- Fixed compilation order in bootstrap
- Added compilation of whole compiler and library in bootstrap
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d99f6c3c41..41a9d2311a 100644
--- a/Makefile
+++ b/Makefile
@@ -312,7 +312,11 @@ cvs-fix-perms :
INSTALL_PREFIX=$(PROJECT_BOOTSTRAPDIR) \
PROJECT_BINARYDIR=$(PROJECT_BOOTSTRAPDIR)/bin \
PROJECT_OUTPUTDIR=$(PROJECT_BOOTSTRAPDIR)/classes \
- boot="bootstrap-" scripts lamplib scalac library
+ boot="bootstrap-" scripts lamplib \
+ .latest-bootstrap-scalac-jc \
+ .latest-bootstrap-library-jc \
+ .latest-bootstrap-library-sc \
+ .latest-bootstrap-scalac-sc;
touch $@
.latest%scalac-jc : $(SCALAC_JC_FILES)
@@ -320,9 +324,7 @@ cvs-fix-perms :
touch $@
.latest%scalac-sc : $(SCALAC_SC_FILES)
- @if [ -d $(PROJECT_BOOTSTRAPDIR) -a -z "$(boot)" ]; then \
- $(make) sc target=SCALAC SCALAC_SC_FILES='$?'; \
- fi;
+ @$(make) sc target=SCALAC SCALAC_SC_FILES='$?'
touch $@
.latest%library-jc : $(LIBRARY_JC_FILES)