From b173b21d5cafabc69c6a5801c75e5e4580ba2911 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 7 Feb 2021 00:20:25 -0800 Subject: [PATCH] scons: Trim down a check for mac OS and arch setting flags. This check used uname to determine if scons was running on macos, and then a fairly elaborate check to see if the version was above 9, and if the hardware supported 64 bit. I think at this point it's safe to assume both that we're at least at macos 10 which is 19 years old, and that Mac hardware supports 64 bit. Change-Id: Ice66df2530bbcc929d3a37e7679634b75ba7b860 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40857 Maintainer: Gabe Black Tested-by: kokoro Reviewed-by: Andreas Sandberg --- SConstruct | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/SConstruct b/SConstruct index 3e892cdbf..3f55730d5 100755 --- a/SConstruct +++ b/SConstruct @@ -574,19 +574,6 @@ conf = Configure(main, 'CheckLinkFlag' : CheckLinkFlag, }) -# Check if we should compile a 64 bit binary on Mac OS X/Darwin -try: - import platform - uname = platform.uname() - if uname[0] == 'Darwin' and compareVersions(uname[2], '9.0.0') >= 0: - if int(readCommand('sysctl -n hw.cpu64bit_capable')[0]): - main.Append(CCFLAGS=['-arch', 'x86_64']) - main.Append(CFLAGS=['-arch', 'x86_64']) - main.Append(LINKFLAGS=['-arch', 'x86_64']) - main.Append(ASFLAGS=['-arch', 'x86_64']) -except: - pass - # Recent versions of scons substitute a "Null" object for Configure() # when configuration isn't necessary, e.g., if the "--help" option is # present. Unfortuantely this Null object always returns false, -- 2.30.2