Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-22 07:35:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Fangrui Song 2018-01-13 00:04:34 -08:00
parent da2cbe4152
commit dab379ad46
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
third_party/siphash.c → third_party/siphash.cc vendored
View File

6
wscript
View File

@ -152,8 +152,7 @@ def configure(ctx):
if ctx.env.CXXFLAGS: if ctx.env.CXXFLAGS:
cxxflags = ctx.env.CXXFLAGS cxxflags = ctx.env.CXXFLAGS
else: 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', '-Werror']
cxxflags = ['-g', '-Wall', '-Wno-sign-compare', '-Wno-deprecated', '-Werror']
if all(not x.startswith('-std=') for x in ctx.env.CXXFLAGS): if all(not x.startswith('-std=') for x in ctx.env.CXXFLAGS):
cxxflags.append('-std=c++11') cxxflags.append('-std=c++11')
@ -359,7 +358,8 @@ def build(bld):
else: else:
rpath = bld.env['LIBPATH_clang'] 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 # https://waf.io/apidocs/tools/c_aliases.html#waflib.Tools.c_aliases.program
bld.program( bld.program(