diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-03-14 20:34:05 +0100 |
|---|---|---|
| committer | Andoni Morales Alastruey <ylatuya@gmail.com> | 2012-03-20 17:19:18 +0100 |
| commit | 2f23a1c7379f4879be95b189b44e740076381aff (patch) | |
| tree | 21e78c3bd67ba141734e7efbc944b91d7a3d4f28 /config | |
| parent | 40e258bf40d91623d9f03f3b73e2de1262e5c9ba (diff) | |
don't override flags already set
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin.config | 6 | ||||
| -rw-r--r-- | config/linux.config | 7 | ||||
| -rw-r--r-- | config/windows.config | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/config/darwin.config b/config/darwin.config index 0a6e8fe3..5425acef 100644 --- a/config/darwin.config +++ b/config/darwin.config @@ -42,9 +42,9 @@ sdk='-mmacosx-version-min=%s -isysroot %s' % (osx_sdk_version, sdk_root) for f in ['CFLAGS', 'CCASFLAGS', 'CXXFLAGS', 'LDFLAGS', 'OBJCFLAGS']: os.environ[f] = os.environ.get(f, '') -os.environ['CFLAGS'] = '-g -O2' -os.environ['CXXFLAGS'] = '-g -O2' -os.environ['OBJCFLAGS'] = '-g -O2' +os.environ['CFLAGS'] += ' -g -O2' +os.environ['CXXFLAGS'] += ' -g -O2' +os.environ['OBJCFLAGS'] += ' -g -O2' if target_arch == Architecture.X86_64: os.environ['CFLAGS'] += ' -arch x86_64 -m64' diff --git a/config/linux.config b/config/linux.config index dfd85c36..a7abc305 100644 --- a/config/linux.config +++ b/config/linux.config @@ -4,7 +4,6 @@ from cerbero.config import Architecture for f in ['CFLAGS', 'CCASFLAGS', 'CXXFLAGS', 'LDFLAGS', 'OBJCFLAGS']: os.environ[f] = os.environ.get(f, '') -os.environ['CFLAGS'] = '-g -O2' -os.environ['CXXFLAGS'] = '-g -O2' -os.environ['OBJCFLAGS'] = '-g -O2' - +os.environ['CFLAGS'] += ' -g -O2' +os.environ['CXXFLAGS'] += ' -g -O2' +os.environ['OBJCFLAGS'] += ' -g -O2' diff --git a/config/windows.config b/config/windows.config index 673cb49e..3363725c 100644 --- a/config/windows.config +++ b/config/windows.config @@ -41,9 +41,9 @@ def cmd(command): return '%s-%s' % (host, command) # Default compiler flags -os.environ['CFLAGS'] = '-g -O2' -os.environ['CXXFLAGS'] = '-g -O2' -os.environ['OBJCFLAGS'] = '-g -O2' +os.environ['CFLAGS'] = '-g -O2 ' +os.environ['CXXFLAGS'] = '-g -O2 ' +os.environ['OBJCFLAGS'] = '-g -O2 ' # Toolchain environment os.environ['CFLAGS'] += "-DWINVER=0x0501" |