fix environment variable issues too

Author: bobzhang

jscomp/others/Makefile

@@ -18,7 +18,7 @@ else
 BS_FLAGS=  $(BS_COMMON_FLAGS) -bs-package-output lib/js 
 endif
 
-COMPFLAGS += $(BS_FLAGS)  -I ../runtime -I ../stdlib -w -40 -w -49
+COMPFLAGS += $(BS_FLAGS)  -I ../runtime -I ../stdlib -w -40 -w -49 -bin-annot
 
 
 

jscomp/runtime/Makefile

@@ -31,7 +31,7 @@ else
 BS_FLAGS=  $(BS_COMMON_FLAGS) -bs-package-output lib/js 
 endif
 
-COMPFLAGS += $(BS_FLAGS) -I ../stdlib -nostdlib -nopervasives -open Pervasives -unsafe -w -40-49
+COMPFLAGS += $(BS_FLAGS) -I ../stdlib -nostdlib -nopervasives -open Pervasives -unsafe -w -40-49 -bin-annot
 
 
 $(RUNTIME): $(COMPILER)

scripts/config.js

@@ -57,7 +57,9 @@ var map = {
 var is_windows = ! (os.type().indexOf('Windows') < 0)
 
 process.env.BS_RELEASE_BUILD = 1
-process.env.OCAMLPARAM = '_,bin-annot=1'
+delete process.env.OCAMLPARAM // stdlib is already compiled using -bin-annot
+// delete process.env.OCAMLLIB // this will not work on Windows
+// delete process.env.CAMLLIB
 process.env.OCAMLRUNPARAM = 'b'
 
 // return False if it does not exist otherwise the map