mozilla-central: changeset 392001:9615a90cf9b030ea72fdc1dd0f42bfa2348aae68

author	Nathan Froyd <froydnj@mozilla.com>
	Wed, 15 Nov 2017 10:12:22 -0500
changeset 392001	9615a90cf9b030ea72fdc1dd0f42bfa2348aae68
parent 392000	776266640ecada42623596ad6ef5c0b203eaae2e
child 392002	0e6f349c815e0424ede297c7269914330ad986a5
push id	32909
push user	cbrindusan@mozilla.com
push date	Wed, 15 Nov 2017 22:25:14 +0000
treeherder	mozilla-central@f41930a869a8 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ted.mielczarek
bugs	1412983
milestone	59.0a1
first release with	nightly linux32 f41930a869a8 / 59.0a1 / 20171116100106 / files nightly linux64 f41930a869a8 / 59.0a1 / 20171116100106 / files nightly mac f41930a869a8 / 59.0a1 / 20171116100106 / files nightly win32 f41930a869a8 / 59.0a1 / 20171116100106 / files nightly win64 f41930a869a8 / 59.0a1 / 20171116100106 / files
last release without	nightly linux32 45715ece25fc / 59.0a1 / 20171115100050 / files nightly linux64 45715ece25fc / 59.0a1 / 20171115100050 / files nightly mac 45715ece25fc / 59.0a1 / 20171115100050 / files nightly win32 45715ece25fc / 59.0a1 / 20171115100050 / files nightly win64 45715ece25fc / 59.0a1 / 20171115100050 / files

Bug 1412983 - part 4 - make extra_toolchain_flags depend on stlport_cppflags; r=ted.mielczarek extra_toolchain_flags is used for compiling target-specific bits of code elsewhere in configure. Very shortly, we'll need to compile bits of code that depend on the C++ standard library, so we'll want to point the compiler at the C++ standard library. Making extra_toolchain_flags include stlport_cppflags is the best way to do that.

build/moz.configure/android-ndk.configure

file | annotate | diff | comparison | revisions

--- a/build/moz.configure/android-ndk.configure
+++ b/build/moz.configure/android-ndk.configure
@@ -236,24 +236,26 @@ def stlport_cppflags(value, ndk, _):
         '-I%s' % cxx_include,
         '-I%s' % os.path.join(ndk, 'sources', 'android', 'support', 'include'),
         '-I%s' % cxxabi_include]
 
 
 add_old_configure_assignment('stlport_cppflags', stlport_cppflags)
 
 
-@depends(android_platform, android_toolchain)
-def extra_toolchain_flags(platform_dir, toolchain_dir):
+@depends(android_platform, android_toolchain, stlport_cppflags)
+def extra_toolchain_flags(platform_dir, toolchain_dir, stlport_cppflags):
     if not platform_dir:
         return []
-    return ['-isystem',
-            os.path.join(platform_dir, 'usr', 'include'),
-            '-gcc-toolchain',
-            toolchain_dir]
+    flags = ['-isystem',
+             os.path.join(platform_dir, 'usr', 'include'),
+             '-gcc-toolchain',
+             toolchain_dir]
+    flags.extend(stlport_cppflags if stlport_cppflags else [])
+    return flags
 
 
 @depends(android_toolchain_prefix_base, android_toolchain)
 def android_toolchain_prefix(prefix_base, toolchain):
     if toolchain:
         return '%s/bin/%s-' % (toolchain, prefix_base)