SConstruct (5273:69faa6c5e314) SConstruct (5274:7888bf966443)
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2005 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 332 unchanged lines hidden (view full) ---

341 if uname[0] == 'Darwin' and compare_versions(uname[2], '9.0.0') >= 0:
342 if int(subprocess.Popen('sysctl -n hw.cpu64bit_capable', shell=True,
343 stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
344 close_fds=True).communicate()[0][0]):
345 env.Append(CCFLAGS='-arch x86_64')
346 env.Append(CFLAGS='-arch x86_64')
347 env.Append(LINKFLAGS='-arch x86_64')
348 env.Append(ASFLAGS='-arch x86_64')
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2005 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 332 unchanged lines hidden (view full) ---

341 if uname[0] == 'Darwin' and compare_versions(uname[2], '9.0.0') >= 0:
342 if int(subprocess.Popen('sysctl -n hw.cpu64bit_capable', shell=True,
343 stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
344 close_fds=True).communicate()[0][0]):
345 env.Append(CCFLAGS='-arch x86_64')
346 env.Append(CFLAGS='-arch x86_64')
347 env.Append(LINKFLAGS='-arch x86_64')
348 env.Append(ASFLAGS='-arch x86_64')
349 env['OSX64bit'] = True
349except:
350 pass
351
352# Recent versions of scons substitute a "Null" object for Configure()
353# when configuration isn't necessary, e.g., if the "--help" option is
354# present. Unfortuantely this Null object always returns false,
355# breaking all our configuration checks. We replace it with our own
356# more optimistic null object that returns True instead.

--- 420 unchanged lines hidden ---
350except:
351 pass
352
353# Recent versions of scons substitute a "Null" object for Configure()
354# when configuration isn't necessary, e.g., if the "--help" option is
355# present. Unfortuantely this Null object always returns false,
356# breaking all our configuration checks. We replace it with our own
357# more optimistic null object that returns True instead.

--- 420 unchanged lines hidden ---