Skip to content

Commit ce270cb

Browse files
committed
tweak build script
1 parent 29174de commit ce270cb

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

scripts/ninja.js

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,7 @@ var getVersionString = () => {
119119
}
120120
return versionString;
121121
};
122-
/**
123-
* @returns {boolean}
124-
*/
125-
var version6 = () => {
126-
return !getVersionString().includes("4.02");
127-
};
122+
128123
/**
129124
*
130125
* @param {string} ninjaCwd
@@ -1042,7 +1037,7 @@ ${ninjaQuickBuidList([
10421037
* generate build.ninja/release.ninja for stdlib-402
10431038
*/
10441039
async function stdlibNinja(devmode = true) {
1045-
var stdlibVersion = version6() ? "stdlib-406" : "stdlib-402";
1040+
var stdlibVersion = "stdlib-406";
10461041
var ninjaCwd = stdlibVersion;
10471042
var stdlibDir = path.join(jscompDir, stdlibVersion);
10481043
var externalDeps = [othersTarget];
@@ -1358,7 +1353,7 @@ function updateDev() {
13581353
path.join(jscompDir, "build.ninja"),
13591354
`
13601355
${getVendorConfigNinja()}
1361-
stdlib = ${version6() ? `stdlib-406` : `stdlib-402`}
1356+
stdlib = stdlib-406
13621357
${BSC_COMPILER}
13631358
subninja compiler.ninja
13641359
subninja runtime/build.ninja
@@ -1373,7 +1368,7 @@ o all: phony runtime others $stdlib test
13731368
`
13741369
ocamlopt = ocamlopt.opt
13751370
ext = exe
1376-
INCL= ${version6() ? "4.06.1+BS" : "4.02.3+BS"}
1371+
INCL= "4.06.1+BS"
13771372
include body.ninja
13781373
`
13791374
);
@@ -1454,7 +1449,7 @@ function getPreprocessorFileName() {
14541449
* Built cppo.exe refmt.exe etc for dev purpose
14551450
*/
14561451
function preprocessorNinjaSync() {
1457-
var refmtMainPath = version6() ? "../lib/4.06.1" : "../lib/4.02.3";
1452+
var refmtMainPath = "../lib/4.06.1";
14581453
var napkinFiles = fs
14591454
.readdirSync(path.join(jscompDir, "..", "syntax", "src"), "ascii")
14601455
.filter((x) => x.endsWith(".ml") || x.endsWith(".mli"));

0 commit comments

Comments
 (0)