Skip to content
Snippets Groups Projects
Commit 81bd45e0 authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

Fixes to make this build on an ARM platform

parent 661cc55f
No related branches found
No related tags found
No related merge requests found
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');
......
......@@ -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 "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment