Skip to content

Commit b182b3a

Browse files
committed
Add the < version check for nodejs/node-v0.x-archive#2685, now that its been merged.
1 parent 1c4f2e9 commit b182b3a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

lib/configure.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,13 @@ function configure (gyp, argv, callback) {
3939
, gyp_addon = path.join(devDir, 'tools', 'gyp_addon')
4040

4141
if (win) {
42-
// add a <= version check when joyent/node#2685 gets merged
43-
argv.push('-Dnode_root_dir=' + devDir)
44-
argv.push('-I')
45-
argv.push(path.join(devDir, 'tools', 'patch.gypi'))
42+
if (version < 0.8) {
43+
// if < 0.8, we need to manually apply the patch at joyent/node#2685,
44+
// since it got merged somewhere in 0.7.x.
45+
argv.push('-Dnode_root_dir=' + devDir)
46+
argv.push('-I')
47+
argv.push(path.join(devDir, 'tools', 'patch.gypi'))
48+
}
4649
} else {
4750
// Force the 'make' target for non-Windows
4851
argv.unshift('.gyp')

0 commit comments

Comments
 (0)