commit 867228ee63ce457b4200c60d829e0ef7c7c0dd35
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Oct 17 16:54:55 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Oct 18 11:11:46 2016 -0700
tree 38dc732e86073965521a4e1a92ce89fabac3d043
parent 9d7f8fe0b6141d6998d34d793d019212531b3bde

build+ci: Synchronize build and CI scripts with ndn-cxx/NFD

This commit also fixes a minor problem causing compilation warnings.

Change-Id: I0c04d58fe9df24f181947b9fde1346283402fc7b

wscript

diff --git a/wscript b/wscript
index 6ae908b..b11e7bd 100644
--- a/wscript
+++ b/wscript
@@ -29,7 +29,7 @@
 
 def options(opt):
     opt.load(['compiler_c', 'compiler_cxx', 'gnu_dirs'])
-    opt.load(['boost', 'default-compiler-flags', 'doxygen'],
+    opt.load(['boost', 'default-compiler-flags', 'sanitizers', 'doxygen'],
              tooldir=['.waf-tools'])
 
     syncopt = opt.add_option_group ("NDN-GROUP-ENCRYPT Options")
@@ -40,7 +40,7 @@
                        help='''build unit tests''')
 
 def configure(conf):
-    conf.load(['compiler_c', 'compiler_cxx', 'gnu_dirs', 'boost', 'default-compiler-flags', 'doxygen'])
+    conf.load(['compiler_c', 'compiler_cxx', 'gnu_dirs', 'boost', 'default-compiler-flags', 'sanitizers', 'doxygen'])
 
     if 'PKG_CONFIG_PATH' not in os.environ:
         os.environ['PKG_CONFIG_PATH'] = Utils.subst_vars('${LIBDIR}/pkgconfig', conf.env)