From 06848cb94657dfa8d670ed34cc414e6f1f71a6ab Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Mon, 28 Sep 2015 18:47:44 +0000
Subject: [PATCH] Updates to build system to fix errors in last rev.
Former-commit-id: 81f754840b18027e840c18039fac078db6cd5c47
---
SConscript | 7 ++++---
SConscript.ida | 12 ++++++------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/SConscript b/SConscript
index ef50eb7e..310f6194 100644
--- a/SConscript
+++ b/SConscript
@@ -22,9 +22,6 @@ if argenv['SMPSA_HOME'] is None:
exit(1)
-if argenv['SECURITY_TRANSFORMS_HOME'] is None:
- print 'Cannot build libstars.a without SECURITY_TRANSFORMS_HOME set. Did you forget the env. var.? Or try setting build_irdb=0. '
- exit(1)
if int(argenv['debug']) == 1:
print "Setting debug mode"
@@ -50,7 +47,11 @@ if int(argenv['build_ida']) == 1:
print "Build IDA Plugin"
lib=SConscript('SConscript.ida', variant_dir='build_ida')
+
if int(argenv['build_irdb']) == 1 or int(argenv['build_irdb_driver']) == 1:
+ if argenv['SECURITY_TRANSFORMS_HOME'] is None:
+ print 'Cannot build libstars.a without SECURITY_TRANSFORMS_HOME set. Did you forget the env. var.? Or try setting build_irdb=0. '
+ exit(1)
print "Build IDA/IRDB library"
lib=SConscript('SConscript.irdb_lib', variant_dir='build_irdb_lib')
diff --git a/SConscript.ida b/SConscript.ida
index 79e26326..e226ec79 100644
--- a/SConscript.ida
+++ b/SConscript.ida
@@ -2,7 +2,7 @@ import os
Import('argenv', 'STARS_CCFLAGS')
-myenv=argenv.Clone()
+idaenv=argenv.Clone()
dirs='''
src/base
@@ -42,20 +42,20 @@ for dir in dirs:
files=files+Glob(os.path.join(dir,"*.cpp"))
# set suffix properly
-if int(myenv['do_64bit_analysis']) == 1:
+if int(idaenv['do_64bit_analysis']) == 1:
SHLIBSUF=".plx64"
else:
SHLIBSUF=".plx"
-idaenv=myenv.Clone(CCFLAGS=IDA_CCFLAGS, SHLINKFLAGS=IDA_LDFLAGS, SHLIBSUFFIX=SHLIBSUF, SHLIBPREFIX="", CPPPATH=Split(cpppath));
+idaenv=idaenv.Clone(CCFLAGS=IDA_CCFLAGS, SHLINKFLAGS=IDA_LDFLAGS, SHLIBSUFFIX=SHLIBSUF, SHLIBPREFIX="", CPPPATH=Split(cpppath));
lib=idaenv.SharedLibrary('SMPStaticAnalyzer', files, LIBPATH="$IDAROOT", libs="ida")
-install=myenv.Install("$IDAROOT/idc/", "$SMPSA_HOME/scripts/SMP.idc")
+install=idaenv.Install("$IDAROOT/idc/", "$SMPSA_HOME/scripts/SMP.idc")
Default(install)
-install=myenv.Install("$IDAROOT/plugins/", lib)
-myenv.Alias("install", "$IDAROOT/plugins/")
+install=idaenv.Install("$IDAROOT/plugins/", lib)
+Default(install)
Return('install')
--
GitLab