Bug 1290040 - Find link.exe from python configure. r=gps

This ensures we have a full path to link.exe from MSVC in LD, avoiding
to use /usr/bin/link on msys2.
This commit is contained in:
Mike Hommey 2016-07-30 07:51:20 +09:00
Родитель 3ec6a69c49
Коммит 51236564fa
2 изменённых файлов: 10 добавлений и 1 удалений

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

@ -25,7 +25,6 @@ case "$target" in
if test -z "$CXX"; then CXX=cl; fi
if test -z "$CPP"; then CPP="$CC -E -nologo"; fi
if test -z "$CXXCPP"; then CXXCPP="$CXX -TP -E -nologo"; ac_cv_prog_CXXCPP="$CXXCPP"; fi
if test -z "$LD"; then LD=link; fi
if test -z "$AS"; then
case "${target_cpu}" in
i*86)

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

@ -379,6 +379,16 @@ def valid_mt(path):
set_config('MSMANIFEST_TOOL', depends(valid_mt)(lambda x: bool(x)))
# Ultimately, this will move to toolchain.configure and be turned into a
# cross-platform check.
option(env='LD', nargs=1, help='Path to the linker')
link = check_prog('LINK', depends_win()(lambda: ('link.exe',)), input='LD',
paths=vc_compiler_path)
add_old_configure_assignment('LD', depends_win(link)(lambda x: x))
# Normally, we'd just have CC, etc. set to absolute paths, but the build system
# doesn't currently handle properly the case where the paths contain spaces.
# Additionally, there's the issue described in toolchain.configure, in