Bug 1412983 - part 3 - move stlport_cppflags prior to extra_toolchain_flags; r=ted.mielczarek

extra_toolchain_flags is going to depend on stlport_cppflags
momentarily, so this commit is just for moving code around.  Note that
the diff shows other things moving *after* stlport_cppflags.
This commit is contained in:
Nathan Froyd 2017-11-15 10:12:23 -05:00
Родитель 741ca70abc
Коммит e03872a402
1 изменённых файлов: 20 добавлений и 19 удалений

Просмотреть файл

@ -198,25 +198,6 @@ def android_toolchain_prefix_base(target):
return target.toolchain return target.toolchain
@depends(android_platform, android_toolchain)
def extra_toolchain_flags(platform_dir, toolchain_dir):
if not platform_dir:
return []
return ['-isystem',
os.path.join(platform_dir, 'usr', 'include'),
'-gcc-toolchain',
toolchain_dir]
@depends(android_toolchain_prefix_base, android_toolchain)
def android_toolchain_prefix(prefix_base, toolchain):
if toolchain:
return '%s/bin/%s-' % (toolchain, prefix_base)
imply_option('--with-toolchain-prefix', android_toolchain_prefix,
reason='--with-android-ndk')
option(env='STLPORT_CPPFLAGS', option(env='STLPORT_CPPFLAGS',
nargs=1, nargs=1,
help='Options compiler should pass for standard C++ library') help='Options compiler should pass for standard C++ library')
@ -260,6 +241,26 @@ def stlport_cppflags(value, ndk, _):
add_old_configure_assignment('stlport_cppflags', stlport_cppflags) add_old_configure_assignment('stlport_cppflags', stlport_cppflags)
@depends(android_platform, android_toolchain)
def extra_toolchain_flags(platform_dir, toolchain_dir):
if not platform_dir:
return []
return ['-isystem',
os.path.join(platform_dir, 'usr', 'include'),
'-gcc-toolchain',
toolchain_dir]
@depends(android_toolchain_prefix_base, android_toolchain)
def android_toolchain_prefix(prefix_base, toolchain):
if toolchain:
return '%s/bin/%s-' % (toolchain, prefix_base)
imply_option('--with-toolchain-prefix', android_toolchain_prefix,
reason='--with-android-ndk')
@depends(stlport_cppflags, extra_toolchain_flags, android_toolchain, @depends(stlport_cppflags, extra_toolchain_flags, android_toolchain,
android_toolchain_prefix_base, '--help') android_toolchain_prefix_base, '--help')
@imports(_from='os.path', _import='isdir') @imports(_from='os.path', _import='isdir')