Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-25 09:05:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Honor environment variable CXXFLAGS and tweak README (#153)

Browse Source 
Also loosen rsync `-a` option to `-rt`
This commit is contained in:
Fangrui Song 2017-12-16 19:39:51 -08:00 committed by GitHub
parent 97da6c937a
commit 0a8ea0e51f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -57,6 +57,9 @@ $ ./waf configure --variant=debug
$ ./waf build --variant=debug # -g -O0, built build/debug/bin/cquery $ ./waf build --variant=debug # -g -O0, built build/debug/bin/cquery
``` ```
See [wiki](https://github.com/jacobdufault/cquery/wiki) for more build instructions
(e.g. using system clang instead of bundled clang+llvm) and other topics.
## Install extension ## Install extension
cquery includes a vscode extension; it is part of the repository. Launch vscode cquery includes a vscode extension; it is part of the repository. Launch vscode

14
wscript
View File

@ -45,8 +45,8 @@ def options(opt):
grp = opt.add_option_group('Configuration options related to use of clang from the system (not recommended)') grp = opt.add_option_group('Configuration options related to use of clang from the system (not recommended)')
grp.add_option('--use-system-clang', dest='use_system_clang', default=False, action='store_true', grp.add_option('--use-system-clang', dest='use_system_clang', default=False, action='store_true',
help='enable use of clang from the system') help='enable use of clang from the system')
grp.add_option('--bundled-clang', dest='bundled_clang', default='4.0.0', choices=('4.0.0', '5.0.0'), grp.add_option('--bundled-clang', dest='bundled_clang', default='4.0.0',
help='bundled clang version') help='bundled clang version, downloaded from http://releases.llvm.org/ , e.g. 4.0.0 5.0.0')
grp.add_option('--llvm-config', dest='llvm_config', default='llvm-config', grp.add_option('--llvm-config', dest='llvm_config', default='llvm-config',
help='specify path to llvm-config for automatic configuration [default: %default]') help='specify path to llvm-config for automatic configuration [default: %default]')
grp.add_option('--clang-prefix', dest='clang_prefix', default='', grp.add_option('--clang-prefix', dest='clang_prefix', default='',
@ -80,11 +80,13 @@ def configure(ctx):
ctx.resetenv(ctx.options.variant) ctx.resetenv(ctx.options.variant)
ctx.load('compiler_cxx') ctx.load('compiler_cxx')
if not ctx.env.CXXFLAGS:
# If environment variable CXXFLAGS is unset, provide a sane default.
cxxflags = ['-g', '-std=c++11', '-Wall', '-Wno-sign-compare', '-Werror'] cxxflags = ['-g', '-std=c++11', '-Wall', '-Wno-sign-compare', '-Werror']
if ctx.options.variant == 'debug': if ctx.options.variant != 'debug':
ctx.env.CXXFLAGS = cxxflags
else:
ctx.env.CXXFLAGS = cxxflags + ['-O3'] ctx.env.CXXFLAGS = cxxflags + ['-O3']
else:
ctx.env.CXXFLAGS = cxxflags
ctx.check(header_name='stdio.h', features='cxx cxxprogram', mandatory=True) ctx.check(header_name='stdio.h', features='cxx cxxprogram', mandatory=True)
@ -237,7 +239,7 @@ def build(bld):
bld.install_files('${PREFIX}/lib/' + clang_tarball_name + '/lib', bld.path.get_bld().ant_glob('lib/' + clang_tarball_name + '/lib/libclang.(dylib|so.[4-9])', quiet=True)) bld.install_files('${PREFIX}/lib/' + clang_tarball_name + '/lib', bld.path.get_bld().ant_glob('lib/' + clang_tarball_name + '/lib/libclang.(dylib|so.[4-9])', quiet=True))
if bld.cmd == 'install': if bld.cmd == 'install':
# TODO This may be cached and cannot be re-triggered. Use proper shell escape. # TODO This may be cached and cannot be re-triggered. Use proper shell escape.
bld(rule='rsync -aR {}/./lib/{}/lib/clang/*/include {}/'.format(bld.path.get_bld(), clang_tarball_name, bld.env['PREFIX'])) bld(rule='rsync -rtR {}/./lib/{}/lib/clang/*/include {}/'.format(bld.path.get_bld(), clang_tarball_name, bld.env['PREFIX']))
#bld.shlib(source='a.cpp', target='mylib', vnum='9.8.7') #bld.shlib(source='a.cpp', target='mylib', vnum='9.8.7')
#bld.shlib(source='a.cpp', target='mylib2', vnum='9.8.7', cnum='9.8') #bld.shlib(source='a.cpp', target='mylib2', vnum='9.8.7', cnum='9.8')