summaryrefslogtreecommitdiff
path: root/source3/wscript
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2019-03-29 18:40:51 +0100
committerRalph Boehme <slow@samba.org>2019-04-24 18:32:14 +0000
commit2f87661c568e33ab4f74e3434ffbb7ec49f03203 (patch)
tree800e0b3565be9a6f4af4fc0469ac50c6d9d0b304 /source3/wscript
parentf52e4020653a3848efef47424e21481ed18d3935 (diff)
downloadsamba-2f87661c568e33ab4f74e3434ffbb7ec49f03203.tar.gz
s3:wscript: fix flex and bison detection
conf.env['BISON'] and conf.env['FLEX'] return lists. Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Noel Power <npower@samba.org>
Diffstat (limited to 'source3/wscript')
-rw-r--r--source3/wscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/wscript b/source3/wscript
index 6f50f5bc552..4eb0fe878cc 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1653,7 +1653,7 @@ main() {
Logs.info("Checking for bison")
bison.configure(conf)
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',
define=None,
on_target=False)
@@ -1662,7 +1662,7 @@ main() {
conf.find_program('flex', var='FLEX')
if conf.env['FLEX']:
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',
define=None,
on_target=False)