From a580e98f28e54b0a706b17f0600afc05ca526c9f Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 16 Dec 2018 17:01:12 +0300 Subject: [PATCH] waflib: force_32bit: try to fix passing additional flags to generate 32bit code on MacOSX --- scripts/waflib/force_32bit.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/waflib/force_32bit.py b/scripts/waflib/force_32bit.py index 65335691..efec6b11 100644 --- a/scripts/waflib/force_32bit.py +++ b/scripts/waflib/force_32bit.py @@ -37,22 +37,20 @@ def configure(conf): conf.env.DEST_SIZEOF_VOID_P = 8 else: if check_32bit(conf, 'Checking if \'{0}\' can target 32-bit'.format(conf.env.COMPILER_CC)): - conf.env.DEST_SIZEOF_VOID_P = 4 # predict state + conf.env.DEST_SIZEOF_VOID_P = 4 else: - flag = '-m32' + flags = ['-m32'] # Think different. if(conf.env.DEST_OS == 'darwin'): - flag = '-arch i386' + flags = ['-arch', 'i386'] env_stash = conf.env - conf.env.append_value('LINKFLAGS', [flag]) - conf.env.append_value('CFLAGS', [flag]) - conf.env.append_value('CXXFLAGS', [flag]) - if check_32bit(conf, '...trying with additional flags'.format(conf.env.COMPILER_CC)): + conf.env.append_value('LINKFLAGS', flags) + conf.env.append_value('CFLAGS', flags) + conf.env.append_value('CXXFLAGS', flags) + if check_32bit(conf, '...trying with additional flags'): conf.env.DEST_SIZEOF_VOID_P = 4 else: conf.env.DEST_SIZEOF_VOID_P = 8 conf.env = env_stash if getattr(conf.env, 'BIT32_MANDATORY') and conf.env.DEST_SIZEOF_VOID_P == 8: conf.fatal('Compiler can\'t create 32-bit code!') - -4