From a3c27786c6aeac55942a805281f45a1571d899f4 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Wed, 16 Nov 2016 15:18:11 +0000 Subject: wscript: move install dirs setting to after C compiler check This fixes waf setting the wrong LIBDIR for DEST_OS=win32 in waflib/Tools/c_config.py:get_cc_version() Any scripts assuming the implib and pkgconfig are in the wrong place should be changed to move the .dll instead. --- wscript | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 935279114b..c4d0c9c8b0 100644 --- a/wscript +++ b/wscript @@ -1053,6 +1053,12 @@ def configure(ctx): ctx.find_program('rst2pdf', var='RST2PDF', mandatory=False) ctx.find_program(windres, var='WINDRES', mandatory=False) + ctx.load('compiler_c') + ctx.load('waf_customizations') + ctx.load('dependencies') + ctx.load('detections.compiler') + ctx.load('detections.devices') + for ident, _, _ in _INSTALL_DIRS_LIST: varname = ident.upper() ctx.env[varname] = getattr(ctx.options, ident) @@ -1061,12 +1067,6 @@ def configure(ctx): while re.match('\$\{([^}]+)\}', ctx.env[varname]): ctx.env[varname] = Utils.subst_vars(ctx.env[varname], ctx.env) - ctx.load('compiler_c') - ctx.load('waf_customizations') - ctx.load('dependencies') - ctx.load('detections.compiler') - ctx.load('detections.devices') - ctx.parse_dependencies(build_options) ctx.parse_dependencies(main_dependencies) ctx.parse_dependencies(audio_output_features) -- cgit v1.2.3