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 /python | |
| parent | 68f4be323c595f7aefcaae0cc4b5a692b9b3e6ff (diff) | |
python/build/ffmpeg.py: remove obsolete -no-integrated-as workaround
Diffstat (limited to 'python')
| -rw-r--r-- | python/build/ffmpeg.py | 9 |
1 files changed, 2 insertions, 7 deletions
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, |