From a4c79fc6fe42b3dc6e4c5a08507dd347d5a85558 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 26 Jul 2013 15:50:35 -0400 Subject: [PATCH] fix handling of the defines of optional deps when cross-compiling --- SConstruct | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/SConstruct b/SConstruct index 40b9ff277..914226319 100644 --- a/SConstruct +++ b/SConstruct @@ -1327,19 +1327,19 @@ if not preconfigured: else: env['SKIPPED_DEPS'].append('boost_regex_icu') - if not env['HOST']: for libname, headers, required, lang, define in OPTIONAL_LIBSHEADERS: - if not conf.CheckLibWithHeader(libname, headers, lang): - if required: - color_print(1, 'Could not find required header or shared library for %s' % libname) - env['MISSING_DEPS'].append(libname) + if not env['HOST']: + if not conf.CheckLibWithHeader(libname, headers, lang): + if required: + color_print(1, 'Could not find required header or shared library for %s' % libname) + env['MISSING_DEPS'].append(libname) + else: + color_print(4, 'Could not find optional header or shared library for %s' % libname) + env['SKIPPED_DEPS'].append(libname) else: - color_print(4, 'Could not find optional header or shared library for %s' % libname) - env['SKIPPED_DEPS'].append(libname) + env.Append(CPPDEFINES = define) else: env.Append(CPPDEFINES = define) - else: - env.Append(CPPDEFINES = define) env['REQUESTED_PLUGINS'] = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])]