oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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
This commit is contained in:
Max Kellermann 2016-10-26 15:38:27 +02:00
parent c776bcc5f6
commit f3dd50de87
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/build/ffmpeg.py
View File

@ -10,6 +10,11 @@ class FfmpegProject(Project):
self.configure_args = configure_args self.configure_args = configure_args
self.cppflags = cppflags 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): def build(self, toolchain):
src = self.unpack(toolchain) src = self.unpack(toolchain)
build = self.make_build_path(toolchain) build = self.make_build_path(toolchain)
@ -29,8 +34,8 @@ class FfmpegProject(Project):
'--cc=' + toolchain.cc, '--cc=' + toolchain.cc,
'--cxx=' + toolchain.cxx, '--cxx=' + toolchain.cxx,
'--nm=' + toolchain.nm, '--nm=' + toolchain.nm,
'--extra-cflags=' + toolchain.cflags + ' ' + toolchain.cppflags + ' ' + self.cppflags, '--extra-cflags=' + self._filter_cflags(toolchain.cflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags,
'--extra-cxxflags=' + toolchain.cxxflags + ' ' + toolchain.cppflags + ' ' + self.cppflags, '--extra-cxxflags=' + self._filter_cflags(toolchain.cxxflags) + ' ' + toolchain.cppflags + ' ' + self.cppflags,
'--extra-ldflags=' + toolchain.ldflags, '--extra-ldflags=' + toolchain.ldflags,
'--extra-libs=' + toolchain.libs, '--extra-libs=' + toolchain.libs,
'--ar=' + toolchain.ar, '--ar=' + toolchain.ar,