Runtime: unix.js in default runtime

ocsigen · Feb 11, 2014 · 0134563 · 0134563
1 parent d2debc6
commit 0134563
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/Makefile.filelist b/Makefile.filelist
@@ -13,7 +13,7 @@ IMPL += lib/syntax/pa_js.cmx lib/syntax/pa_js.cmxs
 endif
 endif
 
-OTHERS := runtime/runtime.js runtime/weak.js runtime/unix.js runtime/classlist.js
+OTHERS := runtime/runtime.js runtime/weak.js runtime/classlist.js
 
 COMP_INTF := compiler/compiler.cmi
 COMP_IMPL := compiler/compiler.cma

diff --git a/lib/META b/lib/META
@@ -4,7 +4,6 @@ archive(byte) = "js_of_ocaml.cma"
 requires = "js_of_ocaml.syntax,lwt"
 
 linkopts(javascript,-joo_noruntime) = "+js_of_ocaml/runtime.js"
-linkopts(javascript,pkg_unix) += "+js_of_ocaml/unix.js"
 linkopts(javascript,joo_weak) += "+js_of_ocaml/weak.js"
 linkopts(javascript,joo_classlist) += "+js_of_ocaml/classlist.js"
 

diff --git a/runtime/Makefile b/runtime/Makefile
@@ -1,5 +1,5 @@
 FILES= 	mlString.js ieee_754.js int64.js md5.js marshall.js \
-	lexing.js parsing.js json.js bigarray.js \
+	lexing.js parsing.js json.js bigarray.js unix.js \
 	stdlib.js jslib.js jslib_js_of_ocaml.js
 
 runtime.js: $(FILES)

diff --git a/tests/Makefile.common b/tests/Makefile.common
@@ -2,7 +2,7 @@
 include ../Makefile.conf
 
 COMP=../compiler/$(COMPILER)
-JSFILES=../runtime/runtime.js ../runtime/unix.js file/unix.js
+JSFILES=../runtime/runtime.js file/unix.js
 OCAMLC=ocamlfind ocamlc -package lwt,deriving -ppopt ../lib/syntax/pa_js.cmo -ppopt ../lib/syntax/pa_deriving_Json.cmo -I ../lib -I ../lib/deriving_json
 STDLIB=$(LIBNAME).cma