Bug 1523198 - Make DIA_SDK_PATH a normal configure input. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D17785

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-01-28 20:37:04 +00:00
Родитель 63d64c8a5d
Коммит d04b0b4a1b
1 изменённых файлов: 8 добавлений и 5 удалений

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

@ -277,14 +277,17 @@ def vc_path(c_compiler, toolchain_search_path):
return os.path.normpath(result) return os.path.normpath(result)
@depends(vc_path) option(env='DIA_SDK_PATH', nargs=1,
help='Path to the Debug Interface Access SDK')
@depends(vc_path, 'DIA_SDK_PATH')
@checking('for the Debug Interface Access SDK', lambda x: x or 'not found') @checking('for the Debug Interface Access SDK', lambda x: x or 'not found')
@imports('os') @imports('os')
@imports(_from='os.path', _import='isdir') @imports(_from='os.path', _import='isdir')
def dia_sdk_dir(vc_path): def dia_sdk_dir(vc_path, dia_sdk_path):
dia_sdk_dir_env = os.environ.get('DIA_SDK_PATH') if dia_sdk_path:
if dia_sdk_dir_env: return os.path.normpath(dia_sdk_path[0])
return os.path.normpath(dia_sdk_dir_env)
if vc_path: if vc_path:
# This would be easier if we had the installationPath that # This would be easier if we had the installationPath that