From 81bd45e0822ba0f7d1ea0b7942ee2196db4c9785 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Mon, 25 Feb 2019 16:43:31 +0000
Subject: [PATCH] Fixes to make this build on an ARM platform
---
SConscript | 23 ++++++++++++++++++-----
SConscript.irdb_lib | 22 +++++++++++++---------
2 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/SConscript b/SConscript
index 1b5aeca0..412f5897 100644
--- a/SConscript
+++ b/SConscript
@@ -1,6 +1,15 @@
import os
import sys
+import platform
+processor=platform.uname()[4];
+
+
+idadefault=0 # Ida is off unless on x86 processor.
+if processor == "x86_64" or processor == "i686" or processor == "i386":
+ idadefault=-1
+
+
argenv=Environment()
# command line options
argenv.Replace(debug=ARGUMENTS.get("debug",0))
@@ -9,8 +18,8 @@ argenv.Replace(debugopt2=ARGUMENTS.get("debugopt2",0))
argenv.Replace(debugmem=ARGUMENTS.get("debugmem",0))
argenv.Replace(do_64bit_analysis=ARGUMENTS.get("do_64bit_analysis",1))
argenv.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",2))
-argenv.Replace(build_ida=ARGUMENTS.get("build_ida",-1))
-argenv.Replace(build_ida7=ARGUMENTS.get("build_ida7",-1))
+argenv.Replace(build_ida=ARGUMENTS.get("build_ida",idadefault))
+argenv.Replace(build_ida7=ARGUMENTS.get("build_ida7",idadefault))
argenv.Replace(build_irdb=ARGUMENTS.get("build_irdb",1))
argenv.Replace(build_irdb_driver=ARGUMENTS.get("build_irdb_driver",0))
argenv.Replace(install=ARGUMENTS.get("install",1))
@@ -118,10 +127,14 @@ Export('argenv', 'STARS_CCFLAGS', 'STARS_LDFLAGS', 'STARS_LDPREFIX')
installers=[]
+
libehpEnv=argenv.Clone()
-libehpEnv.Append(CXXFLAGS=" -m64 ")
-libehpEnv.Append(CFLAGS=" -m64 ")
-libehpEnv.Append(LDFLAGS=" -m64 ")
+
+if processor == "x86_64":
+ libehpEnv.Append(CXXFLAGS=" -m64 ")
+ libehpEnv.Append(CFLAGS=" -m64 ")
+ libehpEnv.Append(LDFLAGS=" -m64 ")
+
env=libehpEnv
Export('env')
libehp=libehpEnv.SConscript("libehp/SConscript", variant_dir='scons_build/libehp');
diff --git a/SConscript.irdb_lib b/SConscript.irdb_lib
index b57fd549..8a2168ba 100644
--- a/SConscript.irdb_lib
+++ b/SConscript.irdb_lib
@@ -2,6 +2,8 @@ import os
Import('argenv', 'STARS_CCFLAGS')
+processor=os.uname()[4]
+
@@ -43,15 +45,17 @@ libs="irdb-core irdb-cfg MEDSannotation irdb-util"
IRDB_LDFLAGS=" "
-# set 32/64 bit build properly
-if int(argenv['do_64bit_build']) == 2:
- print "Defaulting to mach-dep 32/64 bit build parameter"
-elif int(argenv['do_64bit_build']) == 1:
- IRDB_CCFLAGS+=" -m64 "
- IRDB_LDFLAGS+=" -m64 "
-else:
- IRDB_CCFLAGS+=" -m32 "
- IRDB_LDFLAGS+=" -m32 "
+if processor == "x86_64" or processor == "i686" or processor == "i386":
+ # set 32/64 bit build properly
+ if int(argenv['do_64bit_build']) == 2:
+ print "Defaulting to mach-dep 32/64 bit build parameter"
+
+ elif int(argenv['do_64bit_build']) == 1:
+ IRDB_CCFLAGS+=" -m64 "
+ IRDB_LDFLAGS+=" -m64 "
+ else:
+ IRDB_CCFLAGS+=" -m32 "
+ IRDB_LDFLAGS+=" -m32 "
--
GitLab