Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1412983 - part 5 - remove stlport_cppflags dependency from bindgen_cflags_defaults; r=ted.mielczarek

Browse Source 
Now that extra_toolchain_flags includes stlport_cppflags, there's no
reason bindgen_cflags_defaults should depend on them both.  So remove
the stlport_cppflags dependency.  (There's no harm to multiply-including
stlport_cppflags, but not repeating -I options is good practice.)
This commit is contained in:
Nathan Froyd 2017-11-15 10:12:22 -05:00
parent e18f985bb2
commit fd5e1affd1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/moz.configure/android-ndk.configure
View File

@ -263,12 +263,11 @@ imply_option('--with-toolchain-prefix', android_toolchain_prefix,
reason='--with-android-ndk')
@depends(stlport_cppflags, extra_toolchain_flags, android_toolchain,
@depends(extra_toolchain_flags, android_toolchain,
android_toolchain_prefix_base, '--help')
@imports(_from='os.path', _import='isdir')
def bindgen_cflags_defaults(stlport_cppflags, toolchain_flags,
toolchain, toolchain_prefix, _):
if not stlport_cppflags:
def bindgen_cflags_defaults(toolchain_flags, toolchain, toolchain_prefix, _):
if not toolchain_flags:
return
gcc_include = os.path.join(
@ -277,9 +276,8 @@ def bindgen_cflags_defaults(stlport_cppflags, toolchain_flags,
gcc_include = os.path.join(
toolchain, 'lib', 'gcc', toolchain_prefix, '4.9')
cflags_format = "%s %s -I%s -I%s"
return cflags_format % (' '.join(stlport_cppflags),
' '.join(toolchain_flags),
cflags_format = "%s -I%s -I%s"
return cflags_format % (' '.join(toolchain_flags),
os.path.join(gcc_include, 'include'),
os.path.join(gcc_include, 'include-fixed'))