Bug 1615511 - Don't use os.pathsep in windows.configure. r=froydnj

While this works on Windows, because os.pathsep is `;`, it actually
doesn't work on non-Windows, because clang-cl is still expecting `;`,
but os.pathsep is `:`.

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2020-02-14 21:26:09 +00:00
Родитель bb6f2791e3
Коммит fb3ad206c9
1 изменённых файлов: 5 добавлений и 5 удалений

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

@ -191,11 +191,11 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env):
# Universal CRT SDK, chances are this is a start-shell-msvc*.bat
# setup, where INCLUDE and LIB already contain the UCRT paths.
ucrt_includes = [
p for p in os.environ.get('INCLUDE', '').split(os.pathsep)
p for p in os.environ.get('INCLUDE', '').split(';')
if os.path.basename(p).lower() == 'ucrt'
]
ucrt_libs = [
p for p in os.environ.get('LIB', '').split(os.pathsep)
p for p in os.environ.get('LIB', '').split(';')
if os.path.basename(os.path.dirname(p)).lower() == 'ucrt'
]
if ucrt_includes and ucrt_libs:
@ -314,7 +314,7 @@ def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
if dia_sdk_dir:
includes.append(os.path.join(dia_sdk_dir, 'include'))
# Set in the environment for old-configure
includes = os.pathsep.join(includes)
includes = ';'.join(includes)
os.environ['INCLUDE'] = includes
return includes
@ -375,7 +375,7 @@ def lib_path_for(host_or_target):
libs = []
lib_env = os.environ.get('LIB')
if lib_env and not is_host:
libs.extend(lib_env.split(os.pathsep))
libs.extend(lib_env.split(';'))
libs.extend((
os.path.join(vc_path, 'lib', sdk_target),
atlmfc_dir,
@ -393,7 +393,7 @@ def lib_path_for(host_or_target):
@imports('os')
def lib_path(libs):
# Set in the environment for old-configure
libs = os.pathsep.join(libs)
libs = ';'.join(libs)
os.environ['LIB'] = libs
return libs