diff options
author | michelou <michelou@epfl.ch> | 2005-09-28 16:58:15 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2005-09-28 16:58:15 +0000 |
commit | 5a7a0b1dcd43314fe640fa1a1285a1a925f3eb44 (patch) | |
tree | e7a780da5994f3b691716ee6acb2ea63699ca9bf | |
parent | 4be09641200c7539f901bbc08c04c0d7e42696c4 (diff) | |
download | scala-5a7a0b1dcd43314fe640fa1a1285a1a925f3eb44.tar.gz scala-5a7a0b1dcd43314fe640fa1a1285a1a925f3eb44.tar.bz2 scala-5a7a0b1dcd43314fe640fa1a1285a1a925f3eb44.zip |
- added test for Mono environment.
-rw-r--r-- | Makefile.config | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.config b/Makefile.config index 8bfa98cc2d..02187e0633 100644 --- a/Makefile.config +++ b/Makefile.config @@ -64,6 +64,7 @@ CP ?= cp CVS ?= cvs DATE ?= date DIRNAME ?= dirname +DOS2UNIX ?= dos2unix ECHO ?= echo EXPR ?= expr FIND ?= find @@ -117,12 +118,19 @@ SCALADOC ?= $(SCALA_HOME:%=%/bin/)scaladoc SCALAINFO ?= $(SCALA_HOME:%=%/bin/)scala-info ############################################################################## -# .NET tools (Mono) +# .NET/Mono tools CSC ?= csc +CSC_FLAGS ?= /nologo /warn:0 ILASM ?= ilasm +ILASM_FLAGS ?= $(if $(MONO),/debug /dll,/nol /qui /debug /dll) ILDASM ?= ildasm +ILDASM_FLAGS ?= SN ?= sn +SN_FLAGS ?= + +MONO = $(shell $(CSC) --version 2>&1 | \ + $(GREP) -c "Mono" | $(GREP) -v 0) ############################################################################## # Convert tool (ImageMagick) |