Browse Source

use camlp5 instead of camlp4 (#8547)

Andy Li 6 years ago
parent
commit
9bc4999af4
4 changed files with 4 additions and 4 deletions
  1. 1 1
      Makefile
  2. 1 1
      Makefile.win
  3. 1 1
      opam
  4. 1 1
      tests/Brewfile

+ 1 - 1
Makefile

@@ -61,7 +61,7 @@ endif
 
 
 CC_CMD = $(COMPILER) $(ALL_CFLAGS) -c $<
 CC_CMD = $(COMPILER) $(ALL_CFLAGS) -c $<
 
 
-CC_PARSER_CMD = $(COMPILER) -pp camlp4o $(ALL_CFLAGS) -c src/syntax/parser.ml
+CC_PARSER_CMD = $(COMPILER) -pp camlp5o $(ALL_CFLAGS) -c src/syntax/parser.ml
 
 
 RELDIR=../../..
 RELDIR=../../..
 
 

+ 1 - 1
Makefile.win

@@ -33,7 +33,7 @@ endif
 
 
 ifdef FILTER
 ifdef FILTER
 CC_CMD=($(OCAMLOPT) $(ALL_CFLAGS) -c $< 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
 CC_CMD=($(OCAMLOPT) $(ALL_CFLAGS) -c $< 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
-CC_PARSER_CMD=($(OCAMLOPT) -pp camlp4o $(ALL_CFLAGS) -c src/syntax/parser.ml 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
+CC_PARSER_CMD=($(OCAMLOPT) -pp camlp5o $(ALL_CFLAGS) -c src/syntax/parser.ml 2>tmp.cmi && $(FILTER)) || ($(FILTER) && exit 1)
 endif
 endif
 
 
 PACKAGE_FILES=$(OUTPUT) haxelib$(EXTENSION) std "$$(cygpath -w "$$(which zlib1.dll)")" "$$(cygpath -w "$$(which libpcre-1.dll)")"
 PACKAGE_FILES=$(OUTPUT) haxelib$(EXTENSION) std "$$(cygpath -w "$$(which zlib1.dll)")" "$$(cygpath -w "$$(which libpcre-1.dll)")"

+ 1 - 1
opam

@@ -22,7 +22,7 @@ remove: [
 ]
 ]
 depends: [
 depends: [
   "ocamlfind" {build}
   "ocamlfind" {build}
-  "camlp4"    {build}
+  "camlp5"    {build}
   "conf-libpcre"
   "conf-libpcre"
   "conf-zlib"
   "conf-zlib"
   "conf-neko"
   "conf-neko"

+ 1 - 1
tests/Brewfile

@@ -1,5 +1,5 @@
 brew "ocaml"
 brew "ocaml"
-brew "camlp4"
+brew "camlp5"
 brew "zlib"
 brew "zlib"
 brew "pcre"
 brew "pcre"
 brew "awscli"
 brew "awscli"