Merge pull request #3868 from reasonableconsulting/changes-for-rls

Changes for reason-language-server

Author: bobzhang

.gitignore

@@ -141,3 +141,4 @@ jscomp/outcome_printer/reason_syntax_util.mli
 jscomp/bin/all_ounit_tests.ml
 native/
 vendor/ocaml
+jscomp/.lsp

jscomp/.merlin

@@ -22,7 +22,7 @@ S outcome_printer
 B outcome_printer
 
 PKG compiler-libs.common
-# B +compiler-libs
+B +compiler-libs
 
 
 # S runtime

jscomp/build_sorted.ml

@@ -1609,7 +1609,7 @@ rule ocamlmklib
 rule mk_keywords
     command = $ocaml $in
     generator = true
-build ext/js_reserved_map.ml: mk_keywords build_sorted.ml keywords.list
+build ext/js_reserved_map.ml: mk_keywords keywords.list
 
 build stubs/libbs_hash.a stubs/dllbs_hash.so: ocamlmklib stubs/ext_basic_hash_stubs.o
     name = stubs/bs_hash