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