blob: d202a0a9de8af2164c1d6cbbc0ab698d80a8bd40 (
plain)
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
|
--- build/mixxx.py.orig 2010-12-22 11:21:56.000000000 -0800
+++ build/mixxx.py 2010-12-22 11:16:22.000000000 -0800
@@ -189,7 +189,7 @@
if os.environ.has_key('CC'):
self.env['CC'] = os.environ['CC']
if os.environ.has_key('CFLAGS'):
- self.env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+ self.env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
if os.environ.has_key('CXX'):
self.env['CXX'] = os.environ['CXX']
if os.environ.has_key('CXXFLAGS'):
@@ -203,6 +203,10 @@
self.env['LIBS'] = []
self.env['LIBPATH'] = []
+ # Tell Scons how to call the CC and CXX to account for the custom flags.
+ self.env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+ self.env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
+
def install_options(self):
# Global cache directory Put all project files in it so a rm -rf cache
# will clean up the config
--- build/depends.py.orig 2010-12-22 11:13:22.000000000 -0800
+++ build/depends.py 2010-12-22 11:14:02.000000000 -0800
@@ -587,10 +587,8 @@
if build.toolchain_is_gnu:
# Default GNU Options
# TODO(XXX) always generate debugging info?
- build.env.Append(CCFLAGS = '-pipe')
build.env.Append(CCFLAGS = '-Wall')
build.env.Append(CCFLAGS = '-Wextra')
- build.env.Append(CCFLAGS = '-g')
# Check that g++ is present (yeah, SCONS is a bit dumb here)
if os.system("which g++ > /dev/null"): #Checks for non-zero return code
|
GitWeb
