| SConstruct (7756:846fb3ffe0dc) | SConstruct (7769:d4216d81c99e) |
|---|---|
| 1# -*- mode:python -*- 2 3# Copyright (c) 2009 The Hewlett-Packard Development Company 4# Copyright (c) 2004-2005 The Regents of The University of Michigan 5# All rights reserved. 6# 7# Redistribution and use in source and binary forms, with or without 8# modification, are permitted provided that the following conditions are --- 519 unchanged lines hidden (view full) --- 528conf.CheckLeading() 529 530# Check if we should compile a 64 bit binary on Mac OS X/Darwin 531try: 532 import platform 533 uname = platform.uname() 534 if uname[0] == 'Darwin' and compareVersions(uname[2], '9.0.0') >= 0: 535 if int(readCommand('sysctl -n hw.cpu64bit_capable')[0]): | 1# -*- mode:python -*- 2 3# Copyright (c) 2009 The Hewlett-Packard Development Company 4# Copyright (c) 2004-2005 The Regents of The University of Michigan 5# All rights reserved. 6# 7# Redistribution and use in source and binary forms, with or without 8# modification, are permitted provided that the following conditions are --- 519 unchanged lines hidden (view full) --- 528conf.CheckLeading() 529 530# Check if we should compile a 64 bit binary on Mac OS X/Darwin 531try: 532 import platform 533 uname = platform.uname() 534 if uname[0] == 'Darwin' and compareVersions(uname[2], '9.0.0') >= 0: 535 if int(readCommand('sysctl -n hw.cpu64bit_capable')[0]): |
| 536 main.Append(CCFLAGS=['-arch x86_64']) 537 main.Append(CFLAGS=['-arch x86_64']) 538 main.Append(LINKFLAGS=['-arch x86_64']) 539 main.Append(ASFLAGS=['-arch x86_64']) | 536 main.Append(CCFLAGS=['-arch', 'x86_64']) 537 main.Append(CFLAGS=['-arch', 'x86_64']) 538 main.Append(LINKFLAGS=['-arch', 'x86_64']) 539 main.Append(ASFLAGS=['-arch', 'x86_64']) |
| 540except: 541 pass 542 543# Recent versions of scons substitute a "Null" object for Configure() 544# when configuration isn't necessary, e.g., if the "--help" option is 545# present. Unfortuantely this Null object always returns false, 546# breaking all our configuration checks. We replace it with our own 547# more optimistic null object that returns True instead. --- 386 unchanged lines hidden --- | 540except: 541 pass 542 543# Recent versions of scons substitute a "Null" object for Configure() 544# when configuration isn't necessary, e.g., if the "--help" option is 545# present. Unfortuantely this Null object always returns false, 546# breaking all our configuration checks. We replace it with our own 547# more optimistic null object that returns True instead. --- 386 unchanged lines hidden --- |