diff --git a/SConscript b/SConscript index 1086d3d7b1508d4763fc5ef824f13243fbc9a5fb..a515844f56658ebfffda32e089fa56e281bac917 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 f80c140bb2b90a74244ea3a30c2454a78d4eca64..559d97dfc8d9e037e96be864b45d53b9927cb618 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 1a6a5804edcc87da0bc5961fc50182a5c318a3cc..c467cb68f84e79a39c403cb2891d9bb316fa6907 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 bd93ad77ecb9de7738cef8b3d493b62d994773ea..a78db2e2c17d6d5df372e51a04a4295e11837ff4 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 bcf7475657089a1c5d566af5574a1a3d857bb9ac..1ac2a0f296fd426de55dd86c7d4e7ae7f68762d6 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 b9db14f063cf75a5866e2561e085a02cab520987..b376c9b5e1a71990af00f853531c3393b3c3eb23 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 72d8d4b627fcfae334b4da3d34690248504c6488..5b8515f17816f08818ed1ddd1fbc0952a6342a92 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 988c0c653896db0524572f83c17519647493e998..a1654c50cc8fb955fc32984735685d8686e3198f 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 29405ab27e6de8a374f62c6379dce09232a7903f..176588cd19d9a51774e1e83edac587ef0ff717bf 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 a7ba7905cf4fe7f27d2db10acd0441a389c311ab..42a9332c40e4570fb71daa22bfbebac697e5393e 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 0aede7ca6ac02843e5fd146aed6fd42656bc5452..67d3b12b6a3d99216a75789bf0e7ca865c3daada 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 56bc0071d1aaf53cad12547049fb90b6a0627afa..955ef32a6592db0c9c29da5cc771f884cb4c7a86 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 da0c9045f46a50540a2f3939968767937be56c47..86d6a1b7c40db19520eb04ed91a8595887a50b7f 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 1b6d9af8fa2c40d549e3fdb5b525a0702f33a4f7..5bb4180cba416cc44dee8b8f94da64e4b4d45e97 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 3a81a3227f79239c490f30a3565ea513e04f0df8..f5f98f875ab33faa18b8359d31906fffb29860e5 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 99e4a012dcf68b57d694df8fcecca25221df5f55..f3b13ab2245bc7d931422dcb76181f639bbe51ef 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 49893d041c8f5bed2782d4789135cede7b92f311..03c3fa0c89f260b1016d7d069840bc3bc3c2269e 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 e353ba61bb7779ac6b4cb162effe3eaa33f2fcce..8a716d0be93b6fcd5b3a226d23f13a7d176ef194 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 00b4d71974fd889ef8855a03c0264315b0f62697..eaf3bc29c49e6d355628c500dee4dcf9feff35e5 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 f129b0596f8442c1ff69d7a7b16237ad033e8c3a..601a75da6852f467c265d29749fcb0073352a1af 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 68ff522c506d6958b000b089c2361f87d25ff306..f3a38c155c6872128d66d911e814a6f91039d5d9 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 46a94e0b6683de01de80f7a014f221b2a75f70cf..e31a59d9b8377b716aa48d26a38dce0551ecb836 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 918affd83319de08a202715ab1d119f87afbe173..63fd17a23178c4076f9fc644fee922db7bd147eb 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 feabdf33cffa388916cb1dae8ee25a01b2c7fe55..52382e42e049a4dd8928203398c19dd9f6cdf6b4 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 53cd9e4dd6dfb57a80bce6fccb0c2e0ae557e126..16a324bef6249472c6e4b88a29efa0150bfb43f7 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 8a5ff8f0e16aea2c4e3a9b3117320b9299f09304..e30253e1f4c12a6cc21511fce6d7d53f74736c69 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 602a3e368f9822a2605f1ce973e040733ed5e61e..268cddf012cec7cebd7f4477410900a4dff14cb5 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/")