Browse Source

waflib: force_32bit: fix wrong DEST_SIZEOF_VOID_P when 64-bit build is allowed

pull/2/head
Alibek Omarov 6 years ago
parent
commit
82697ca2a9
  1. 7
      scripts/waflib/force_32bit.py

7
scripts/waflib/force_32bit.py

@ -33,12 +33,11 @@ def check_32bit(ctx, msg): @@ -33,12 +33,11 @@ def check_32bit(ctx, msg):
return True
def configure(conf):
if getattr(conf.env, 'BIT32_ALLOW64'):
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
else:
conf.env.DEST_SIZEOF_VOID_P = 8
if not conf.env.BIT32_ALLOW64:
flags = ['-m32']
# Think different.
if(conf.env.DEST_OS == 'darwin'):
@ -52,5 +51,5 @@ def configure(conf): @@ -52,5 +51,5 @@ def configure(conf):
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:
if conf.env.BIT32_MANDATORY and conf.env.DEST_SIZEOF_VOID_P == 8:
conf.fatal('Compiler can\'t create 32-bit code!')

Loading…
Cancel
Save