sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3:wscript: fix flex and bison detection

Browse Source 
conf.env['BISON'] and conf.env['FLEX'] return lists.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Ralph Boehme 2019-03-29 18:40:51 +01:00
parent f52e402065
commit 2f87661c56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/wscript
View File

@ -1653,7 +1653,7 @@ main() {
Logs.info("Checking for bison") Logs.info("Checking for bison")
bison.configure(conf) bison.configure(conf)
if conf.env['BISON']: if conf.env['BISON']:
conf.CHECK_COMMAND('%s --version | head -n1' % conf.env.BISON, conf.CHECK_COMMAND('%s --version | head -n1' % conf.env.BISON[0],
msg='Using bison version', msg='Using bison version',
define=None, define=None,
on_target=False) on_target=False)
@ -1662,7 +1662,7 @@ main() {
conf.find_program('flex', var='FLEX') conf.find_program('flex', var='FLEX')
if conf.env['FLEX']: if conf.env['FLEX']:
conf.env.FLEXFLAGS = ['-t'] conf.env.FLEXFLAGS = ['-t']
conf.CHECK_COMMAND('%s --version' % conf.env.FLEX, conf.CHECK_COMMAND('%s --version' % conf.env.FLEX[0],
msg='Using flex version', msg='Using flex version',
define=None, define=None,
on_target=False) on_target=False)