2f8dfd
diff -up ./node_build/make.js.dyn ./node_build/make.js
9da2f5
--- ./node_build/make.js.dyn	2018-04-18 03:35:41.000000000 -0400
9da2f5
+++ ./node_build/make.js	2018-06-28 13:50:51.922657841 -0400
9da2f5
@@ -256,48 +256,9 @@ Builder.configure({
2f8dfd
 
2f8dfd
     }).nThen(function (waitFor) {
2f8dfd
 
2f8dfd
-        builder.config.libs.push(dependencyDir + '/cnacl/jsbuild/libnacl.a');
2f8dfd
-        builder.config.includeDirs.push(dependencyDir + '/cnacl/jsbuild/include/');
2f8dfd
-
4f4b22
-        // needed for Sign.c which pulls in crypto_int32.h
4f4b22
-        builder.config.includeDirs.push(dependencyDir + '/cnacl/jsbuild/include_internal/');
4f4b22
-
2f8dfd
-        Fs.exists(dependencyDir + '/cnacl/jsbuild/libnacl.a', waitFor(function (exists) {
2f8dfd
-            if (exists) { return; }
2f8dfd
-
2f8dfd
-            console.log("Build NaCl");
2f8dfd
-            var cwd = process.cwd();
2f8dfd
-            process.chdir(dependencyDir + '/cnacl/');
2f8dfd
-
2f8dfd
-            var NaCl = require(process.cwd() + '/node_build/make.js');
2f8dfd
-            NaCl.build(function (args, callback) {
2f8dfd
-                if (builder.config.systemName !== 'win32') {
2f8dfd
-                    args.unshift('-fPIC');
2f8dfd
-                }
2f8dfd
-
2f8dfd
-                args.unshift(builder.config.optimizeLevel, '-fomit-frame-pointer');
2f8dfd
-
9da2f5
-                if (!/^\-O0$/.test(builder.config.optimizeLevel)) {
9da2f5
-                    args.unshift('-D_FORTIFY_SOURCE=2');
9da2f5
-                }
9da2f5
-
2f8dfd
-                if (CFLAGS) {
2f8dfd
-                    [].push.apply(args, CFLAGS.split(' '));
2f8dfd
-                }
2f8dfd
-
2f8dfd
-                if (!builder.config.crossCompiling) {
9da2f5
-                    if (NO_MARCH_FLAG.indexOf(process.arch) == -1) {
9da2f5
-                        args.unshift('-march=native');
2f8dfd
-                    }
2f8dfd
-                }
2f8dfd
-
2f8dfd
-                builder.cc(args, callback);
2f8dfd
-            },
2f8dfd
-            builder.config,
2f8dfd
-            waitFor(function () {
2f8dfd
-                process.chdir(cwd);
2f8dfd
-            }));
2f8dfd
-        }));
e38043
+        builder.config.libs.push('-lnacl');
2f8dfd
+        builder.config.libs.push('-lstdc++');
e38043
+        builder.config.includeDirs.push('/usr/include/nacl/');
2f8dfd
 
2f8dfd
     }).nThen(function (waitFor) {
2f8dfd
 
9da2f5
@@ -442,7 +403,7 @@ Builder.configure({
2f8dfd
     builder.buildExecutable('crypto/random/randombytes.c');
2f8dfd
 
2f8dfd
     builder.lintFiles(function (fileName, file, callback) {
2f8dfd
-        if (/dependencies/.test(fileName)) {
2f8dfd
+        if (/(dependencies|\/usr\/include)/.test(fileName)) {
2f8dfd
             callback('', false);
2f8dfd
             return;
2f8dfd
         }