summaryrefslogtreecommitdiff
blob: 09c0088232440b41bde24620d5abb959c72f2994 (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
--- 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'):
--- 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