Skip to content

Commit 709ef8f

Browse files
committed
exclude make generator
1 parent 3cb661d commit 709ef8f

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

lib/configure.js

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,24 @@ async function configure (gyp, argv) {
9393
'build dir', '"build" dir needed to be created?', isNew ? 'Yes' : 'No'
9494
)
9595
if (win) {
96-
let gypFormatIndex = argv.indexOf('-f')
97-
if (gypFormatIndex === -1) {
98-
gypFormatIndex = argv.indexOf('--format')
99-
}
100-
if (gypFormatIndex === -1 || !argv[gypFormatIndex + 1] || argv[gypFormatIndex + 1].startsWith('msvs')) {
101-
const vsInfo = await findVisualStudio(release.semver, gyp.opts['msvs-version'])
102-
return createConfigFile(vsInfo)
96+
let usingMakeGenerator = false
97+
for (let i = argv.length - 1; i >= 0; --i) {
98+
const arg = argv[i]
99+
if (arg === '-f' || arg === '--format') {
100+
const format = argv[i + 1]
101+
if (typeof format === 'string' && format.startsWith('make')) {
102+
usingMakeGenerator = true
103+
break
104+
}
105+
} else if (arg.startsWith('--format=make')) {
106+
usingMakeGenerator = true
107+
break
108+
}
103109
}
104110
let vsInfo = {}
105-
try {
111+
if (!usingMakeGenerator) {
106112
vsInfo = await findVisualStudio(release.semver, gyp.opts['msvs-version'])
107-
} catch (_) {}
113+
}
108114
return createConfigFile(vsInfo)
109115
}
110116
return createConfigFile(null)

0 commit comments

Comments
 (0)