Skip to content

Commit 5aa8fbc

Browse files
committed
updating pre-built module resolution for macOS
1 parent f649733 commit 5aa8fbc

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

lib/edge.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ else if (process.platform === 'win32') {
2929
edgeNative = path.resolve(__dirname, './native/' + process.platform + '/' + process.arch + '/' + determineVersion() + '/' + (process.env.EDGE_USE_CORECLR ? 'edge_coreclr' : 'edge_nativeclr'));
3030
}
3131
else if(process.platform === 'darwin'){
32-
console.log('checkMono: ',checkMono());
33-
edgeNative = path.resolve(__dirname, './native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + (process.env.EDGE_USE_CORECLR ? 'edge_coreclr.node' : 'edge_nativeclr.node'));
32+
edgeNative = path.resolve(__dirname, './native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + (process.env.EDGE_USE_CORECLR || !checkMono() ? 'edge_coreclr.node' : 'edge_nativeclr.node'));
3433
if(!fs.existsSync(edgeNative)){
3534
edgeNative = builtEdge;
3635
if(!fs.existsSync(edgeNative)){

tools/checkMono.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,4 @@ module.exports = function() {
1414
let mono = exists('which mono');
1515
let pkgconfig = exists('which pkg-config');
1616
return mono && pkgconfig
17-
}
18-
19-
20-
17+
}

tools/install.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ const fs = require('fs')
33
, spawn = require('child_process').spawn
44
, whereis = require('./whereis');
55

6+
const checkMono = require('./checkMono');
7+
68
if (process.platform === 'win32') {
79
const libroot = path.resolve(__dirname, '../lib/native/win32')
810
, lib32bit = path.resolve(libroot, 'ia32')
@@ -93,7 +95,9 @@ else {
9395
const edjeNative = path.resolve(__dirname, '../lib/native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_nativeclr.node');
9496
const edjeNativeClr = path.resolve(__dirname, '../lib/native/' + process.platform + '/' + process.arch + '/' + nodeVersion + '/' + 'edge_coreclr.node');
9597

96-
if(fs.existsSync(edjeNative) && fs.existsSync(edjeNativeClr)){
98+
const checkNative = checkMono() ? fs.existsSync(edjeNative) : true;
99+
100+
if(checkNative && fs.existsSync(edjeNativeClr)){
97101
spawn('dotnet', ['build', '--configuration', 'Release'], { stdio: 'inherit', cwd: path.resolve(__dirname, '..', 'lib', 'bootstrap') })
98102

99103
}

0 commit comments

Comments
 (0)