diff options
| author | Max Kellermann <max@musicpd.org> | 2021-01-19 20:11:41 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2021-01-19 20:17:47 +0100 |
| commit | 3825175bfc7bf5438bf2ef24be027dd43b320ad9 (patch) | |
| tree | da132a0e072afbf2e10c88cea30feabba7596e6b | |
| parent | 68f4be323c595f7aefcaae0cc4b5a692b9b3e6ff (diff) | |
python/build/ffmpeg.py: remove obsolete -no-integrated-as workaround
| -rwxr-xr-x | android/build.py | 2 | ||||
| -rw-r--r-- | python/build/ffmpeg.py | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/android/build.py b/android/build.py index 5bee46304..982160783 100755 --- a/android/build.py +++ b/android/build.py @@ -103,7 +103,7 @@ class AndroidNdkToolchain: llvm_bin = os.path.join(llvm_path, 'bin') self.cc = os.path.join(llvm_bin, 'clang') self.cxx = os.path.join(llvm_bin, 'clang++') - common_flags += ' -target ' + llvm_triple + ' -integrated-as -gcc-toolchain ' + toolchain_path + common_flags += ' -target ' + llvm_triple + ' -gcc-toolchain ' + toolchain_path common_flags += ' -fvisibility=hidden -fdata-sections -ffunction-sections' diff --git a/python/build/ffmpeg.py b/python/build/ffmpeg.py index 6c0753618..ae2ff6b00 100644 --- a/python/build/ffmpeg.py +++ b/python/build/ffmpeg.py @@ -10,11 +10,6 @@ class FfmpegProject(Project): self.configure_args = configure_args self.cppflags = cppflags - def _filter_cflags(self, flags): - # FFmpeg expects the GNU as syntax - flags = flags.replace(' -integrated-as ', ' -no-integrated-as ') - return flags - def build(self, toolchain): src = self.unpack(toolchain) build = self.make_build_path(toolchain) @@ -36,8 +31,8 @@ class FfmpegProject(Project): '--cc=' + toolchain.cc, '--cxx=' + toolchain.cxx, '--nm=' + toolchain.nm, - '--extra-cflags=' + self._filter_cflags(toolchain.cflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags, - '--extra-cxxflags=' + self._filter_cflags(toolchain.cxxflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags, + '--extra-cflags=' + toolchain.cflags + ' ' + toolchain.cppflags + ' ' + self.cppflags, + '--extra-cxxflags=' + toolchain.cxxflags + ' ' + toolchain.cppflags + ' ' + self.cppflags, '--extra-ldflags=' + toolchain.ldflags, '--extra-libs=' + toolchain.libs, '--ar=' + toolchain.ar, |