Bug 1573355 - Fix openh264 builds. r=Callek

Differential Revision: https://phabricator.services.mozilla.com/D41689 --HG-- extra : moz-landing-system : lando
mozilla · Aug 13, 2019 · 1339663 · 1339663
1 parent f53affe
commit 1339663
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 10 deletions.
diff --git a/taskcluster/ci/openh264-plugin/kind.yml b/taskcluster/ci/openh264-plugin/kind.yml
@@ -46,7 +46,9 @@ jobs:
                 - openh264/linux32.py
             tooltool-downloads: public
         toolchains:
+            - linux64-binutils
             - linux64-clang
+            - linux64-nasm
     linux64/opt:
         attributes:
             build_platform: linux64
@@ -67,7 +69,9 @@ jobs:
                 - openh264/linux64.py
             tooltool-downloads: public
         toolchains:
+            - linux64-binutils
             - linux64-clang
+            - linux64-nasm
     macosx64/opt:
         attributes:
             build_platform: macosx64
@@ -177,6 +181,7 @@ jobs:
             - android-ndk-linux
             - android-sdk-linux
             - linux64-clang
+            - linux64-nasm
     android-aarch64/opt:
         attributes:
             build_platform: android-aarch64
@@ -204,6 +209,7 @@ jobs:
             - android-ndk-linux
             - android-sdk-linux
             - linux64-clang
+            - linux64-nasm
     android-x86/opt:
         attributes:
             build_platform: android-x86
@@ -231,6 +237,7 @@ jobs:
             - android-ndk-linux
             - android-sdk-linux
             - linux64-clang
+            - linux64-nasm
     android-x86_64/opt:
         attributes:
             build_platform: android-x86_64
@@ -258,3 +265,4 @@ jobs:
             - android-ndk-linux
             - android-sdk-linux
             - linux64-clang
+            - linux64-nasm
diff --git a/testing/mozharness/configs/openh264/android-aarch64.py b/testing/mozharness/configs/openh264/android-aarch64.py
@@ -28,7 +28,10 @@
     'min_sdk': 21,
     'operating_system': 'android',
     'partial_env': {
+        'CXXFLAGS': '-stdlib=libstdc++',
+        'LDFLAGS': '-stdlib=libstdc++',
         'PATH': ('%(abs_work_dir)s/src/android-sdk-linux/tools:'
-                 '%(abs_work_dir)s/src/clang/bin/:%(PATH)s'),
+                 '%(abs_work_dir)s/src/clang/bin:'
+                 '%(abs_work_dir)s/src/nasm:%(PATH)s'),
     },
 }
diff --git a/testing/mozharness/configs/openh264/android-arm.py b/testing/mozharness/configs/openh264/android-arm.py
@@ -28,7 +28,10 @@
     'min_sdk': 16,
     'operating_system': 'android',
     'partial_env': {
+        'CXXFLAGS': '-stdlib=libstdc++',
+        'LDFLAGS': '-stdlib=libstdc++',
         'PATH': ('%(abs_work_dir)s/src/android-sdk-linux/tools:'
-                 '%(abs_work_dir)s/src/clang/bin/:%(PATH)s'),
+                 '%(abs_work_dir)s/src/clang/bin:'
+                 '%(abs_work_dir)s/src/nasm:%(PATH)s'),
     },
 }
diff --git a/testing/mozharness/configs/openh264/android-x86.py b/testing/mozharness/configs/openh264/android-x86.py
@@ -29,7 +29,10 @@
     'min_sdk': 16,
     'operating_system': 'android',
     'partial_env': {
+        'CXXFLAGS': '-stdlib=libstdc++',
+        'LDFLAGS': '-stdlib=libstdc++',
         'PATH': ('%(abs_work_dir)s/src/android-sdk-linux/tools:'
-                 '%(abs_work_dir)s/src/clang/bin/:%(PATH)s'),
+                 '%(abs_work_dir)s/src/clang/bin:'
+                 '%(abs_work_dir)s/src/nasm:%(PATH)s'),
     },
 }
diff --git a/testing/mozharness/configs/openh264/android-x86_64.py b/testing/mozharness/configs/openh264/android-x86_64.py
@@ -29,7 +29,10 @@
     'min_sdk': 16,
     'operating_system': 'android',
     'partial_env': {
+        'CXXFLAGS': '-stdlib=libstdc++',
+        'LDFLAGS': '-stdlib=libstdc++',
         'PATH': ('%(abs_work_dir)s/src/android-sdk-linux/tools:'
-                 '%(abs_work_dir)s/src/clang/bin/:%(PATH)s'),
+                 '%(abs_work_dir)s/src/clang/bin:'
+                 '%(abs_work_dir)s/src/nasm:%(PATH)s'),
     },
 }
diff --git a/testing/mozharness/configs/openh264/linux32.py b/testing/mozharness/configs/openh264/linux32.py
@@ -19,6 +19,8 @@
     'avoid_avx2': True,
     'operating_system': 'linux',
     'partial_env': {
-        'PATH': '%(abs_work_dir)s/src/clang/bin/:%(PATH)s',
+        'PATH': ('%(abs_work_dir)s/src/clang/bin:'
+                 '%(abs_work_dir)s/src/binutils/bin:'
+                 '%(abs_work_dir)s/src/nasm:%(PATH)s'),
     },
 }
diff --git a/testing/mozharness/configs/openh264/linux64.py b/testing/mozharness/configs/openh264/linux64.py
@@ -19,6 +19,8 @@
     'avoid_avx2': True,
     'operating_system': 'linux',
     'partial_env': {
-        'PATH': '%(abs_work_dir)s/src/clang/bin/:%(PATH)s',
+        'PATH': ('%(abs_work_dir)s/src/clang/bin:'
+                 '%(abs_work_dir)s/src/binutils/bin:'
+                 '%(abs_work_dir)s/src/nasm:%(PATH)s'),
     },
 }
diff --git a/testing/mozharness/configs/openh264/macosx64.py b/testing/mozharness/configs/openh264/macosx64.py
@@ -19,15 +19,14 @@
     'use_yasm': True,
     'operating_system': 'darwin',
     'partial_env': {
-        'CXXFLAGS': ('-target x86_64-apple-darwin11 '
+        'CXXFLAGS': ('-target x86_64-apple-darwin '
                      '-B %(abs_work_dir)s/src/cctools/bin '
                      '-isysroot %(abs_work_dir)s/src/MacOSX10.11.sdk '
                      '-mmacosx-version-min=10.11'),
-        'LDFLAGS': ('-target x86_64-apple-darwin11 '
+        'LDFLAGS': ('-target x86_64-apple-darwin '
                     '-B %(abs_work_dir)s/src/cctools/bin '
                     '-isysroot %(abs_work_dir)s/src/MacOSX10.11.sdk '
-                    '-mmacosx-version-min=10.11 '
-                    '-fuse-ld=%(abs_work_dir)s/src/cctools/bin/x86_64-darwin11-ld'),
+                    '-mmacosx-version-min=10.11'),
         'PATH': '%(abs_work_dir)s/src/clang/bin/:%(PATH)s',
     },
     "tooltool_servers": ['http://taskcluster/tooltool.mozilla-releng.net/'],