summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Frisch <alain@frisch.fr>2013-10-18 15:15:10 +0000
committerAlain Frisch <alain@frisch.fr>2013-10-18 15:15:10 +0000
commitfe3afbdce8bbf5d1b959855aed4dec05f0ddba16 (patch)
tree9094d68f687089c615b931a95734684797404769
parenta96fb5be4508c38814ad888e22e57f8ef4dcb8ad (diff)
Revert bad(?) commit.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/raise_variants@14238 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6faba3922..21adf58ca 100644
--- a/Makefile
+++ b/Makefile
@@ -384,8 +384,8 @@ partialclean::
ocamlc: compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma $(BYTESTART)
$(CAMLC) $(LINKFLAGS) -compat-32 -o ocamlc \
compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma $(BYTESTART)
- #$(SWITCH_COMPILER) enable COMPILER=CAMLC VARIANT=BYTE
- #$(SWITCH_COMPILER) disable COMPILER=CAMLC VARIANT=OPT
+ $(SWITCH_COMPILER) enable COMPILER=CAMLC VARIANT=BYTE
+ $(SWITCH_COMPILER) disable COMPILER=CAMLC VARIANT=OPT
partialclean::
if [ -n "$(ROOTDIR)" ]; then \
@@ -518,7 +518,7 @@ ocamlc.opt: compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlbytecomp.cmxa \
$(CAMLOPT) $(LINKFLAGS) -ccopt "$(BYTECCLINKOPTS)" -o ocamlc.opt \
compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlbytecomp.cmxa \
$(BYTESTART:.cmo=.cmx) -cclib "$(BYTECCLIBS)"
- #$(SWITCH_COMPILER) enable COMPILER=CAMLC VARIANT=OPT
+ $(SWITCH_COMPILER) enable COMPILER=CAMLC VARIANT=OPT
partialclean::
rm -f ocamlc.opt
@@ -538,7 +538,7 @@ ocamlopt.opt: compilerlibs/ocamlcommon.cmxa compilerlibs/ocamloptcomp.cmxa \
$(CAMLOPT) $(LINKFLAGS) -o ocamlopt.opt \
compilerlibs/ocamlcommon.cmxa compilerlibs/ocamloptcomp.cmxa \
$(OPTSTART:.cmo=.cmx)
- #$(SWITCH_COMPILER) enable COMPILER=CAMLOPT VARIANT=OPT
+ $(SWITCH_COMPILER) enable COMPILER=CAMLOPT VARIANT=OPT
partialclean::
rm -f ocamlopt.opt