diff options
author | Ricardo Constantino <wiiaboo@gmail.com> | 2016-11-16 15:18:11 +0000 |
---|---|---|
committer | Ricardo Constantino <wiiaboo@gmail.com> | 2016-11-16 17:29:22 +0000 |
commit | a3c27786c6aeac55942a805281f45a1571d899f4 (patch) | |
tree | 52705da7f70c6053d0ec294f0f3a28a43d8d7310 /wscript | |
parent | 03ea61c89563a5bb6b9072fcd89f1e577cf0fcbf (diff) | |
download | mpv-a3c27786c6aeac55942a805281f45a1571d899f4.tar.bz2 mpv-a3c27786c6aeac55942a805281f45a1571d899f4.tar.xz |
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.
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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) |