From c06dfd82802d8a41f986e15bb54be0945bb01d18 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Thu, 4 Jun 2015 18:49:56 +0000
Subject: [PATCH] Former-commit-id: 243bc52c9b97d5ecfed8a466190554910c175821

---
 SConscript                        |  6 +-----
 beaengine/SConscript              | 10 +++++++---
 libIRDB/src/cfg/SConscript        |  5 ++---
 libIRDB/src/core/SConscript       |  5 ++---
 libIRDB/src/syscall/SConscript    |  5 ++---
 libIRDB/src/util/SConscript       |  5 ++---
 libIRDB/test/SConscript           |  5 +----
 libMEDSannotation/SConscript      |  4 ++--
 libtransform/src/SConscript       |  5 +----
 tools/c2e/SConscript              |  4 ++--
 tools/cgc_hlx/SConscript          |  4 +---
 tools/cgc_rigrandom/SConscript    |  4 ++--
 tools/cgclibc/SConscript          |  4 ++--
 tools/cinderella/SConscript       |  4 ++--
 tools/cover/SConscript            |  4 +---
 tools/fix_rets/SConscript         |  3 +--
 tools/fptr_shadow/SConscript      |  4 +---
 tools/inferfn/SConscript          |  4 +---
 tools/meds2pdb/SConscript         |  4 +---
 tools/memcover/SConscript         |  3 +--
 tools/prince/SConscript           |  4 +---
 tools/ret_shadow_stack/SConscript |  4 +---
 tools/safefr/SConscript           |  3 +--
 tools/selective_cfi/SConscript    |  3 +--
 tools/simple_cdi/SConscript       |  4 +---
 tools/spasm/SConscript            |  3 +--
 tools/watch_syscall/SConscript    |  4 ++--
 27 files changed, 43 insertions(+), 74 deletions(-)

diff --git a/SConscript b/SConscript
index 1086d3d7b..a515844f5 100644
--- a/SConscript
+++ b/SConscript
@@ -2,11 +2,7 @@ import shutil
 import os
 import tarfile
 
-
-
-env=Environment()
-Export('env')
-
+Import('env')
 
 if env.GetOption('clean'):
     if os.path.exists("third_party/ELFIO"):
diff --git a/beaengine/SConscript b/beaengine/SConscript
index f80c140bb..559d97dfc 100644
--- a/beaengine/SConscript
+++ b/beaengine/SConscript
@@ -11,10 +11,14 @@ cpppath='''
 	./beaengineSources/Includes/
 	'''
 
-CFLAGS="-fPIC  -pedantic -ansi -pipe -fno-common -fshort-enums -g -Wall -W -Wextra -Wconversion -Wno-long-long -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings"
-CC="gcc"
 
-env=env.Clone(CC=CC, CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+# inherit from above.
+#CFLAGS="-fPIC  -pedantic -ansi -pipe -fno-common -fshort-enums -g -Wall -W -Wextra -Wconversion -Wno-long-long -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings"
+#CC="gcc"
+#env=env.Clone(CC=CC, CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+
+
+env=env.Clone(CPPPATH=Split(cpppath))
 lib=env.Library("BeaEngine_s_d", Split(files))
 
 install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/libIRDB/src/cfg/SConscript b/libIRDB/src/cfg/SConscript
index 1a6a5804e..c467cb68f 100644
--- a/libIRDB/src/cfg/SConscript
+++ b/libIRDB/src/cfg/SConscript
@@ -15,10 +15,9 @@ cpppath='''
 	$SECURITY_TRANSFORMS_HOME/beaengine/beaengineSources/Includes/
 	'''
 
-CFLAGS="-fPIC  -Wall -W -Wextra -Wconversion "
-CC="g++"
+env['CCFLAGS'].append(Split("-Wall -W -Wextra -Wconversion "))
 
-env=env.Clone(CC=CC, CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 lib=env.Library(libname, Split(files))
 
 install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/libIRDB/src/core/SConscript b/libIRDB/src/core/SConscript
index bd93ad77e..a78db2e2c 100644
--- a/libIRDB/src/core/SConscript
+++ b/libIRDB/src/core/SConscript
@@ -28,10 +28,9 @@ cpppath='''
 	$SECURITY_TRANSFORMS_HOME/beaengine/beaengineSources/Includes/
 	'''
 
-CFLAGS="-fPIC  -Wall -W -Wextra -Wconversion "
-CC="g++"
+env['CCFLAGS'].append(Split("-Wall -W -Wextra -Wconversion "))
 
-env=env.Clone(CC=CC, CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 lib=env.Library(libname, Split(files))
 
 install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/libIRDB/src/syscall/SConscript b/libIRDB/src/syscall/SConscript
index bcf747565..1ac2a0f29 100644
--- a/libIRDB/src/syscall/SConscript
+++ b/libIRDB/src/syscall/SConscript
@@ -15,10 +15,9 @@ cpppath='''
 	$SECURITY_TRANSFORMS_HOME/beaengine/beaengineSources/Includes/
 	'''
 
-CFLAGS="-fPIC  -Wall -W -Wextra -Wconversion "
-CC="g++"
+env['CCFLAGS'].append(Split("-Wall -W -Wextra -Wconversion "))
 
-env=env.Clone(CC=CC, CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 lib=env.Library(libname, Split(files))
 
 install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/libIRDB/src/util/SConscript b/libIRDB/src/util/SConscript
index b9db14f06..b376c9b5e 100644
--- a/libIRDB/src/util/SConscript
+++ b/libIRDB/src/util/SConscript
@@ -15,10 +15,9 @@ cpppath='''
 	$SECURITY_TRANSFORMS_HOME/beaengine/beaengineSources/Includes/
 	'''
 
-CFLAGS="-fPIC  -Wall -W -Wextra -Wconversion "
-CC="g++"
+env['CCFLAGS'].append(Split("-Wall -W -Wextra -Wconversion "))
 
-env=env.Clone(CC=CC, CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 lib=env.Library(libname, Split(files))
 
 install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/libIRDB/test/SConscript b/libIRDB/test/SConscript
index 72d8d4b62..5b8515f17 100644
--- a/libIRDB/test/SConscript
+++ b/libIRDB/test/SConscript
@@ -12,13 +12,10 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/beaengine/include 
 	'''
 
-CFLAGS="-fPIC  "
-
-
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d ")
 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program("fill_in_indtargs.exe",  Split("read_ehframe.cpp fill_in_indtargs.cpp check_thunks.cpp"), LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/libMEDSannotation/SConscript b/libMEDSannotation/SConscript
index 988c0c653..a1654c50c 100644
--- a/libMEDSannotation/SConscript
+++ b/libMEDSannotation/SConscript
@@ -21,9 +21,9 @@ cpppath='''
 	./include/
 	'''
 
-CFLAGS="-fPIC  "
+#CFLAGS="-fPIC  "
 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 lib=env.Library(lib, Split(files))
 
 install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
diff --git a/libtransform/src/SConscript b/libtransform/src/SConscript
index 29405ab27..176588cd1 100644
--- a/libtransform/src/SConscript
+++ b/libtransform/src/SConscript
@@ -17,13 +17,10 @@ cpppath='''
         '''
 
 
-CFLAGS="-fPIC  "
-
-
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d ")
 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 lib=env.Library("transform",  Split(files), LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/lib/")
diff --git a/tools/c2e/SConscript b/tools/c2e/SConscript
index a7ba7905c..42a9332c4 100644
--- a/tools/c2e/SConscript
+++ b/tools/c2e/SConscript
@@ -13,7 +13,7 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
+#CFLAGS="-fPIC  "
 
 files=Glob("*.cpp")
 
@@ -22,7 +22,7 @@ pgm="c2e.exe"
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite")
 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/cgc_hlx/SConscript b/tools/cgc_hlx/SConscript
index 0aede7ca6..67d3b12b6 100644
--- a/tools/cgc_hlx/SConscript
+++ b/tools/cgc_hlx/SConscript
@@ -14,15 +14,13 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
-
 files=Glob("*.cpp")
 
 pgm="cgc_hlx.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/cgc_rigrandom/SConscript b/tools/cgc_rigrandom/SConscript
index 56bc0071d..955ef32a6 100644
--- a/tools/cgc_rigrandom/SConscript
+++ b/tools/cgc_rigrandom/SConscript
@@ -13,7 +13,7 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
+#CFLAGS="-fPIC  "
 
 files=Glob("*.cpp")
 
@@ -22,7 +22,7 @@ pgm="rigrandom.exe"
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite")
 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/cgclibc/SConscript b/tools/cgclibc/SConscript
index da0c9045f..86d6a1b7c 100644
--- a/tools/cgclibc/SConscript
+++ b/tools/cgclibc/SConscript
@@ -15,9 +15,9 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CCFLAGS="-fPIC  -DCGC"
+env['CCFLAGS'].append("-DCGC")
 
-env=env.Clone(CPPPATH=Split(cpppath), CCFLAGS=CCFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 cgclibc=env.Object("cgclibc.cpp")
 files1=Split("cgclibc_driver.cpp")+cgclibc
 files2=Split("display_functions.cpp")+cgclibc 
diff --git a/tools/cinderella/SConscript b/tools/cinderella/SConscript
index 1b6d9af8f..5bb4180cb 100644
--- a/tools/cinderella/SConscript
+++ b/tools/cinderella/SConscript
@@ -14,7 +14,7 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
+#CFLAGS="-fPIC  "
 
 files=Glob("*.cpp")
 
@@ -22,7 +22,7 @@ pgm="cinderella_prep.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/cover/SConscript b/tools/cover/SConscript
index 3a81a3227..f5f98f875 100644
--- a/tools/cover/SConscript
+++ b/tools/cover/SConscript
@@ -13,8 +13,6 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
-
 files=Glob("*.cpp")
 
 pgm="cover"
@@ -22,7 +20,7 @@ pgm="cover"
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite")
 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/fix_rets/SConscript b/tools/fix_rets/SConscript
index 99e4a012d..f3b13ab22 100644
--- a/tools/fix_rets/SConscript
+++ b/tools/fix_rets/SConscript
@@ -14,7 +14,6 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
 
 files=Glob("*.cpp")
 
@@ -22,7 +21,7 @@ pgm="fix_rets.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/fptr_shadow/SConscript b/tools/fptr_shadow/SConscript
index 49893d041..03c3fa0c8 100644
--- a/tools/fptr_shadow/SConscript
+++ b/tools/fptr_shadow/SConscript
@@ -14,15 +14,13 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
-
 files=Glob("*.cpp")
 
 pgm="fptr_shadow64.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/inferfn/SConscript b/tools/inferfn/SConscript
index e353ba61b..8a716d0be 100644
--- a/tools/inferfn/SConscript
+++ b/tools/inferfn/SConscript
@@ -14,15 +14,13 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
-
 files=Glob("*.cpp")
 
 pgm="inferfn.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/meds2pdb/SConscript b/tools/meds2pdb/SConscript
index 00b4d7197..eaf3bc29c 100644
--- a/tools/meds2pdb/SConscript
+++ b/tools/meds2pdb/SConscript
@@ -15,15 +15,13 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
-
 files=Glob("*.cpp")
 
 pgm="meds2pdb"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx xform BeaEngine_s_d rewrite MEDSannotation ") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/memcover/SConscript b/tools/memcover/SConscript
index f129b0596..601a75da6 100644
--- a/tools/memcover/SConscript
+++ b/tools/memcover/SConscript
@@ -14,7 +14,6 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
 
 files=Glob("*.cpp")
 
@@ -22,7 +21,7 @@ pgm="memcover.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/prince/SConscript b/tools/prince/SConscript
index 68ff522c5..f3a38c155 100644
--- a/tools/prince/SConscript
+++ b/tools/prince/SConscript
@@ -16,15 +16,13 @@ cpppath='''
 	 $ZIPR_CALLBACKS/inferfn
 	'''
 
-CFLAGS="-fPIC  "
-
 files=Glob("*.cpp")
 
 pgm="prince_driver.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/ret_shadow_stack/SConscript b/tools/ret_shadow_stack/SConscript
index 46a94e0b6..e31a59d9b 100644
--- a/tools/ret_shadow_stack/SConscript
+++ b/tools/ret_shadow_stack/SConscript
@@ -14,15 +14,13 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
-
 files=Glob("*.cpp")
 
 pgm="ret_shadow_stack.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/safefr/SConscript b/tools/safefr/SConscript
index 918affd83..63fd17a23 100644
--- a/tools/safefr/SConscript
+++ b/tools/safefr/SConscript
@@ -14,7 +14,6 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
 
 files=Glob("*.cpp")
 
@@ -22,7 +21,7 @@ pgm="fill_in_safefr.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/selective_cfi/SConscript b/tools/selective_cfi/SConscript
index feabdf33c..52382e42e 100644
--- a/tools/selective_cfi/SConscript
+++ b/tools/selective_cfi/SConscript
@@ -14,7 +14,6 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
 
 files=Glob("*.cpp")
 
@@ -22,7 +21,7 @@ pgm="selective_cfi.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/simple_cdi/SConscript b/tools/simple_cdi/SConscript
index 53cd9e4dd..16a324bef 100644
--- a/tools/simple_cdi/SConscript
+++ b/tools/simple_cdi/SConscript
@@ -14,15 +14,13 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
-
 files=Glob("*.cpp")
 
 pgm="simple_cdi.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/spasm/SConscript b/tools/spasm/SConscript
index 8a5ff8f0e..e30253e1f 100644
--- a/tools/spasm/SConscript
+++ b/tools/spasm/SConscript
@@ -14,7 +14,6 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CFLAGS="-fPIC  "
 
 files=Glob("*.cpp")
 
@@ -22,7 +21,7 @@ pgm="spasm"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CFLAGS=CFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
diff --git a/tools/watch_syscall/SConscript b/tools/watch_syscall/SConscript
index 602a3e368..268cddf01 100644
--- a/tools/watch_syscall/SConscript
+++ b/tools/watch_syscall/SConscript
@@ -14,7 +14,7 @@ cpppath='''
 	 $SECURITY_TRANSFORMS_HOME/tools/transforms 
 	'''
 
-CCFLAGS="-fPIC  -DCGC"
+env['CFLAGS'].append("-DCGC")
 
 files=Glob("*.cpp")
 
@@ -22,7 +22,7 @@ pgm="watch_syscall.exe"
 
 LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
 LIBS=Split("IRDB-core IRDB-cfg IRDB-syscall IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation") 
-env=env.Clone(CPPPATH=Split(cpppath), CCFLAGS=CCFLAGS)
+env=env.Clone(CPPPATH=Split(cpppath))
 pgm=env.Program(pgm,  files,  LIBPATH=LIBPATH, LIBS=LIBS)
 install=env.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
 env.Alias("install", "$SECURITY_TRANSFORMS_HOME/bin/")
-- 
GitLab