Teach landmines script that Linux now uses ninja by default.
Mostly for documentation purposes. It'll also uselessly cause a clobber. BUG=239257 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/14940023 git-svn-id: http://src.chromium.org/svn/trunk/src/build@199622 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
976b68c698
Коммит
6c15a83626
10
landmines.py
10
landmines.py
|
@ -47,7 +47,7 @@ def memoize(default=None):
|
|||
|
||||
@memoize()
|
||||
def IsWindows():
|
||||
return sys.platform.startswith('win') or sys.platform == 'cygwin'
|
||||
return sys.platform in ['win32', 'cygwin']
|
||||
|
||||
|
||||
@memoize()
|
||||
|
@ -57,7 +57,7 @@ def IsLinux():
|
|||
|
||||
@memoize()
|
||||
def IsMac():
|
||||
return sys.platform.startswith('darwin')
|
||||
return sys.platform == 'darwin'
|
||||
|
||||
|
||||
@memoize()
|
||||
|
@ -123,7 +123,7 @@ def builder():
|
|||
elif IsWindows():
|
||||
return 'msvs'
|
||||
elif IsLinux():
|
||||
return 'make'
|
||||
return 'ninja'
|
||||
elif IsMac():
|
||||
return 'xcode'
|
||||
else:
|
||||
|
@ -167,9 +167,7 @@ def get_target_build_dir(build_tool, target, is_iphone=False):
|
|||
if build_tool == 'xcode':
|
||||
ret = os.path.join(SRC_DIR, 'xcodebuild',
|
||||
target + ('-iphoneos' if is_iphone else ''))
|
||||
elif build_tool == 'make':
|
||||
ret = os.path.join(SRC_DIR, 'out', target)
|
||||
elif build_tool in ['ninja', 'ninja-ios']:
|
||||
elif build_tool in ['make', 'ninja', 'ninja-ios']: # TODO: Remove ninja-ios.
|
||||
ret = os.path.join(SRC_DIR, 'out', target)
|
||||
elif build_tool in ['msvs', 'vs', 'ib']:
|
||||
ret = os.path.join(SRC_DIR, 'build', target)
|
||||
|
|
Загрузка…
Ссылка в новой задаче