1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
--- SConstruct.orig 2011-12-16 18:02:27.000000000 +0100
+++ SConstruct 2011-12-17 04:39:19.000000000 +0100
@@ -702,7 +702,10 @@
#make scons colorgcc friendly
env['ENV']['HOME'] = os.environ['HOME']
- env['ENV']['TERM'] = os.environ['TERM']
+ try:
+ env['ENV']['TERM'] = os.environ['TERM']
+ except KeyError:
+ env['ENV']['TERM'] = 'dumb'
if linux and has_option( "sharedclient" ):
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
@@ -785,8 +788,9 @@
options_topass["nix"] = nix
if has_option( "use-system-" + shortName ) or has_option( "use-system-all" ):
- print( "using system version of: " + shortName )
- myModule.configureSystem( env , fileLists , options_topass )
+ if not (shortName == 'sm' and usev8):
+ print( "using system version of: " + shortName )
+ myModule.configureSystem( env , fileLists , options_topass )
else:
myModule.configure( env , fileLists , options_topass )
@@ -1446,7 +1450,7 @@
fullInstallName = installDir + "/bin/" + name
allBinaries += [ name ]
- if (solaris or linux) and (not has_option("nostrip")):
+ if (solaris or linux or freebsd) and (not has_option("nostrip")):
e.AddPostAction( inst, e.Action( 'strip ' + fullInstallName ) )
if not has_option( "no-glibc-check" ) and linux and len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) == "s3dist":
|
