Skip to content

Commit 9b45ab2

Browse files
authored
Merge pull request rescript-lang#5462 from rescript-lang/fix-prebuilt
Get prebuilt.js to run again
2 parents 7c0a343 + 023ec16 commit 9b45ab2

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

scripts/prebuilt.js

+3-12
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,12 @@ var bin_path =
5656
path.join(__dirname, '..', process.platform === 'darwin' && process.arch === 'arm64' ? process.platform + process.arch : process.platform)
5757

5858
function buildCompiler() {
59-
// for 4.02.3 it relies on OCAMLLIB to find stdlib path
60-
// for 4.06.1 OCAMLLIB is another PATH
61-
// delete process.env.OCAMLLIB
6259
var prebuilt = "prebuilt.ninja";
6360
var content = require("./ninjaFactory.js").libNinja({
6461
ocamlopt: use_env_compiler
6562
? `ocamlopt.opt`
6663
: `../native/${ocamlVersion}/bin/ocamlopt.opt`,
67-
INCL: ocamlVersion,
64+
INCL: "4.06.1",
6865
isWin: is_windows,
6966
});
7067

@@ -89,15 +86,9 @@ if (!is_windows) {
8986

9087
}
9188

92-
function createOCamlTar() {
89+
function createNinjaTar() {
9390
if (isHostPlatform()) {
9491
require("./installUtils.js").install();
95-
console.log(`status in ocaml submodule:`);
96-
cp.execSync(`git -C ocaml status -uno`, { cwd: root, stdio: [0, 1, 2] });
97-
cp.execSync(
98-
`git -C ocaml archive --format=tar.gz HEAD -o ../vendor/ocaml.tar.gz`,
99-
{ cwd: root, stdio: [0, 1, 2] }
100-
);
10192
console.log(`status in ninja submodule:`);
10293
cp.execSync(`git -C ninja status -uno`, { cwd: root, stdio: [0, 1, 2] });
10394
cp.execSync(
@@ -107,5 +98,5 @@ function createOCamlTar() {
10798
}
10899
}
109100

110-
createOCamlTar();
101+
createNinjaTar();
111102
buildCompiler();

0 commit comments

Comments
 (0)