Merge branch 'enable_fortify_source' of git://github.com/madafoo/cjdns into crashey

node_build/make.js

@@ -162,6 +162,10 @@ Builder.configure({
         });
     }
 
+    if (!/^\-O0$/.test(builder.config.optimizeLevel)) {
+        builder.config.cflags.push('-D_FORTIFY_SOURCE=2');
+    }
+
     // We also need to pass various architecture/floating point flags to GCC when invoked as
     // a linker.
     if (LDFLAGS) {
@@ -272,6 +276,10 @@ Builder.configure({
 
                 args.unshift(builder.config.optimizeLevel, '-fomit-frame-pointer');
 
+                if (!/^\-O0$/.test(builder.config.optimizeLevel)) {
+                    args.unshift('-D_FORTIFY_SOURCE=2');
+                }
+
                 if (CFLAGS) {
                     [].push.apply(args, CFLAGS.split(' '));
                 }
@@ -386,6 +394,10 @@ Builder.configure({
                 ];
                 var cflags = [builder.config.optimizeLevel, '-DNO_EMFILE_TRICK=1'];
 
+                if (!/^\-O0$/.test(builder.config.optimizeLevel)) {
+                    cflags.push('-D_FORTIFY_SOURCE=2');
+                }
+
                 if (!(/darwin|win32/i.test(builder.config.systemName))) {
                     cflags.push('-fPIC');
                 }