Skip to content

Commit 25c152d

Browse files
committed
fix the native compiler version
- TODO: OCAML_PATCH is not relevant
1 parent 7f96a8a commit 25c152d

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

jscomp/test/condition_compilation_test.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type open_flag =
4040
#end
4141

4242
let vv =
43-
#if OCAML_PATCH = "BS"
43+
#if 1
4444
3
4545
#else
4646
1
@@ -50,7 +50,7 @@ let vv =
5050
let v = ref 1
5151

5252
let a =
53-
#if OCAML_PATCH = "BS"
53+
#if 1
5454
let () = incr v in
5555
#end !v
5656

scripts/ninja.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,13 +1444,12 @@ function setSortedToStringAsNativeDeps(xs) {
14441444
* @returns {string}
14451445
*/
14461446
function getVendorConfigNinja() {
1447-
var prefix = `../native/${require("./buildocaml.js").getVersionPrefix()}/bin`;
14481447
return `
1449-
ocamlopt = ${prefix}/ocamlopt.opt
1450-
ocamllex = ${prefix}/ocamllex.opt
1451-
ocamlc = ${prefix}/ocamlc.opt
1452-
ocamlmklib = ${prefix}/ocamlmklib
1453-
ocaml = ${prefix}/ocaml
1448+
ocamlopt = ocamlopt.opt
1449+
ocamllex = ocamllex.opt
1450+
ocamlc = ocamlc.opt
1451+
ocamlmklib = ocamlmklib
1452+
ocaml = ocaml
14541453
`;
14551454
}
14561455

0 commit comments

Comments
 (0)