From 34da6cce6e49fdfcfeab7c80b47c3527e06d7089 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 20 Sep 2020 02:39:17 +0100 Subject: [PATCH] Special tricks for static win64 mixed build Signed-off-by: falkTX --- wscript | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/wscript b/wscript index 9e16f1a6..d3a1d5cb 100644 --- a/wscript +++ b/wscript @@ -425,6 +425,14 @@ def configure(conf): conf.env['LIBDIR'] = Options.options.libdir32 else: conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib32' + + if conf.env['IS_WINDOWS'] and conf.env['BUILD_STATIC']: + def replaceFor32bit(env): + for e in env: yield e.replace('x86_64', 'i686', 1) + for env in ('AR', 'CC', 'CXX', 'LINK_CC', 'LINK_CXX'): + conf.all_envs[lib32][env] = list(replaceFor32bit(conf.all_envs[lib32][env])) + conf.all_envs[lib32]['LIB_REGEX'] = ['tre32'] + # libdb does not work in mixed mode conf.all_envs[lib32]['HAVE_DB'] = 0 conf.all_envs[lib32]['HAVE_DB_H'] = 0