summaryrefslogtreecommitdiff
path: root/net-p2p/linuxdcpp/files/patch-SConstruct
blob: dc015c73be99b29ec6d7a4aaec0523c7cc7f0c8b (plain) (blame)
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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
--- SConstruct.orig	Sat Dec 16 11:52:44 2006
+++ SConstruct	Sat Dec 16 11:54:05 2006
@@ -62,7 +62,7 @@
 # Initialization
 # ----------------------------------------------------------------------
 
-env = Environment(ENV = os.environ, options = opts)
+env = Environment(ENV = os.environ, options = opts, CC = '%%CC%%', CXX = '%%CXX%%')
 
 conf = Configure(env,
 	custom_tests =
@@ -97,15 +97,6 @@
 	print 'Compiler version check failed. g++ 3.4 or later is needed'
 	Exit(1)
 
-# Add support for compiler caches to speed-up compilation.
-if conf.TryAction(Action('distcc'))[0]:
-	env.Prepend(CXX = 'distcc ')
-	print 'Enabling distcc...'
-
-if conf.TryAction(Action('ccache'))[0]:
-	env.Prepend(CXX = 'ccache ')
-	print 'Enabling ccache...'
-
 if not conf.CheckPKGConfig():
 	print '\tpkg-config not found.'
 	Exit(1)
@@ -137,11 +128,6 @@
 	print '\tHeader file unistd.h not found'
 	Exit(1)
 
-if not conf.CheckLibWithHeader('pthread', 'pthread.h', 'c'):
-	print '\tpthread library not found'
-	print '\tNote: You might have the lib but not the headers'
-	Exit(1)
-
 if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'):
 	print '\tz library (gzip/z compression) not found'
 	print '\tNote: You might have the lib but not the headers'
@@ -168,11 +154,11 @@
 env.Append(LINKFLAGS = ['-Wl,--as-needed'])
 
 if env.has_key('debug') and env['debug']:
-	env.Append(CXXFLAGS = Split('-g -ggdb -D_DEBUG -Wall'))
+	env.Append(CXXFLAGS = Split('%%CXXFLAGS%% -g -ggdb -D_DEBUG -Wall'))
 	env.Append(LINKFLAGS = Split('-g -ggdb -Wall'))
 
 if env.has_key('release') and env['release']:
-	env.Append(CXXFLAGS = '-O3')
+	env.Append(CXXFLAGS = '%%CXXFLAGS%%')
 
 if env.has_key('profile') and env['profile']:
 	env.Append(CXXFLAGS = '-pg')