From fcaedec2ab027971fdb342d257c4af6d3560edde Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Fri, 19 Jan 2018 11:18:45 +0100
Subject: [PATCH] {android,win32}/build.py: move "-O* -g" to common_flags
---
android/build.py | 7 ++++---
win32/build.py | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/android/build.py b/android/build.py
index edabccf01..393f1d7da 100755
--- a/android/build.py
+++ b/android/build.py
@@ -65,7 +65,8 @@ class AndroidNdkToolchain:
llvm_path = os.path.join(ndk_path, 'toolchains', 'llvm', 'prebuilt', build_arch)
llvm_triple = 'armv7-none-linux-androideabi'
- common_flags = '-march=armv7-a -mfloat-abi=softfp'
+ common_flags = '-Os -g'
+ common_flags += ' -march=armv7-a -mfloat-abi=softfp'
toolchain_bin = os.path.join(toolchain_path, 'bin')
llvm_bin = os.path.join(llvm_path, 'bin')
@@ -80,8 +81,8 @@ class AndroidNdkToolchain:
self.nm = os.path.join(toolchain_bin, arch + '-nm')
self.strip = os.path.join(toolchain_bin, arch + '-strip')
- self.cflags = '-Os -g ' + common_flags
- self.cxxflags = '-Os -g ' + common_flags
+ self.cflags = common_flags
+ self.cxxflags = common_flags
self.cppflags = '--sysroot=' + sysroot + \
' -isystem ' + os.path.join(install_prefix, 'include') + \
' -isystem ' + os.path.join(sysroot, 'usr', 'include', arch) + \
diff --git a/win32/build.py b/win32/build.py
index d2b1aef1a..45c5dfa4c 100755
--- a/win32/build.py
+++ b/win32/build.py
@@ -50,14 +50,14 @@ class CrossGccToolchain:
self.nm = os.path.join(toolchain_bin, arch + '-nm')
self.strip = os.path.join(toolchain_bin, arch + '-strip')
- common_flags = ''
+ common_flags = '-O2 -g'
if not x64:
# enable SSE support which is required for LAME
common_flags += ' -march=pentium3'
- self.cflags = '-O2 -g ' + common_flags
- self.cxxflags = '-O2 -g ' + common_flags
+ self.cflags = common_flags
+ self.cxxflags = common_flags
self.cppflags = '-isystem ' + os.path.join(install_prefix, 'include')
self.ldflags = '-L' + os.path.join(install_prefix, 'lib')
self.libs = ''