Fix ia32 case: nwjs/nw.js#7104: using clang to build native modules

nwjs · Sep 18, 2019 · 1eb5e1b · 1eb5e1b
1 parent 392ac70
commit 1eb5e1b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/build.js b/lib/build.js
@@ -211,6 +211,9 @@ function build (gyp, argv, callback) {
         argv.push('/p:LinkToolExe=lld-link.exe')
         argv.push('/p:CLToolPath=' + path.resolve(__dirname, '..', 'clang'))
         argv.push('/p:LinkToolPath=' + path.resolve(__dirname, '..', 'clang'))
+        if (arch.toLowerCase() === 'ia32') {
+          process.env.CL='-m32'
+        }
       }
     }
 
@@ -255,7 +258,7 @@ function build (gyp, argv, callback) {
       }
     }
 
-    var proc = gyp.spawn(command, argv)
+    var proc = gyp.spawn(command, argv, {env: process.env})
     proc.on('exit', onExit)
   }
 

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "bindings",
     "gyp"
   ],
-  "version": "3.6.4",
+  "version": "3.6.5",
   "installVersion": 9,
   "author": "Roger Wang <wenrui@gmail.com> (based on node-gyp)",
   "repository": { "type": "git", "url": "https://github.com/nwjs/nw-gyp.git" },