python/build/ffmpeg.py: remove obsolete -no-integrated-as workaround

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'
 

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,