From 257e9ee39919e16d135cb100006601ba77303b82 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 2 Apr 2020 14:28:12 +0200 Subject: Pass force-cpp11 down to libcxml. --- cscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cscript b/cscript index c3ce3d9d..d5197d28 100644 --- a/cscript +++ b/cscript @@ -37,10 +37,11 @@ import shutil option_defaults = { 'force-cpp11': False, 'jpeg': 'oj2' } def dependencies(target, options): + libcxml = ('libcxml', '0d18df4', {'force-cpp11': options['force-cpp11']}) if (target.platform == 'windows' and target.version == 'xp') or options['jpeg'] == 'oj1': - return (('libcxml', '0d18df4'), ('openjpeg', 'f166257'), ('asdcplib', 'carl')) + return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', 'carl')) else: - return (('libcxml', '0d18df4'), ('openjpeg', '956af06'), ('asdcplib', 'carl')) + return (libcxml, ('openjpeg', '956af06'), ('asdcplib', 'carl')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory -- cgit v1.2.3