From dab379ad46081d37eff31e0a1f36fbc15c70cbcd Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sat, 13 Jan 2018 00:04:34 -0800 Subject: [PATCH] Fix tests --- third_party/{siphash.c => siphash.cc} | 0 wscript | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename third_party/{siphash.c => siphash.cc} (100%) diff --git a/third_party/siphash.c b/third_party/siphash.cc similarity index 100% rename from third_party/siphash.c rename to third_party/siphash.cc diff --git a/wscript b/wscript index ec151612..dda15864 100644 --- a/wscript +++ b/wscript @@ -152,8 +152,7 @@ def configure(ctx): if ctx.env.CXXFLAGS: cxxflags = ctx.env.CXXFLAGS else: - # FIXME Figure out how to treat siphash.c as C file so that we can remove -Wno-deprecated - cxxflags = ['-g', '-Wall', '-Wno-sign-compare', '-Wno-deprecated', '-Werror'] + cxxflags = ['-g', '-Wall', '-Wno-sign-compare', '-Werror'] if all(not x.startswith('-std=') for x in ctx.env.CXXFLAGS): cxxflags.append('-std=c++11') @@ -359,7 +358,8 @@ def build(bld): else: rpath = bld.env['LIBPATH_clang'] - bld.objects(name='siphash', source='third_party/siphash.c') + # FIXME Figure out how to mix C and C++ source files and change it back to .c + bld.objects(name='siphash', source='third_party/siphash.cc') # https://waf.io/apidocs/tools/c_aliases.html#waflib.Tools.c_aliases.program bld.program(