diff options
| author | Max Kellermann <max@musicpd.org> | 2016-10-26 15:38:27 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2016-10-26 17:00:17 +0200 |
| commit | f3dd50de871828a87375477d884259bd5950a6b4 (patch) | |
| tree | a69a9f927dcef8752fde2a143a6abae7548d4178 /python | |
| parent | c776bcc5f6a5a22a9133d601296d4c8e9934a4c8 (diff) | |
python/build/ffmpeg: disable clang's integrated assembler
Causes compatibility problems, because FFmpeg expects the GNU as
syntax.
This FFmpeg bug report has some information, but it was closed as
"invalid": https://trac.ffmpeg.org/ticket/5158
Diffstat (limited to 'python')
| -rw-r--r-- | python/build/ffmpeg.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/python/build/ffmpeg.py b/python/build/ffmpeg.py index 1a5ec3d5f..d75e98044 100644 --- a/python/build/ffmpeg.py +++ b/python/build/ffmpeg.py @@ -10,6 +10,11 @@ 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) @@ -29,8 +34,8 @@ class FfmpegProject(Project): '--cc=' + toolchain.cc, '--cxx=' + toolchain.cxx, '--nm=' + toolchain.nm, - '--extra-cflags=' + toolchain.cflags + ' ' + toolchain.cppflags + ' ' + self.cppflags, - '--extra-cxxflags=' + toolchain.cxxflags + ' ' + toolchain.cppflags + ' ' + self.cppflags, + '--extra-cflags=' + self._filter_cflags(toolchain.cflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags, + '--extra-cxxflags=' + self._filter_cflags(toolchain.cxxflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags, '--extra-ldflags=' + toolchain.ldflags, '--extra-libs=' + toolchain.libs, '--ar=' + toolchain.ar, |