Skip to content
Snippets Groups Projects
Commit d6b8a4fb authored by ARATA Mizuki's avatar ARATA Mizuki Committed by Zubin
Browse files

Use bundled llc/opt on Windows (#22438)

(cherry picked from commit 92976985)
parent b9b6807e
No related branches found
No related tags found
No related merge requests found
......@@ -85,6 +85,11 @@ AC_DEFUN([FP_SETTINGS],
SettingsWindresCommand="$WindresCmd"
fi
# LLVM backend tools
SettingsLlcCommand="$LlcCmd"
SettingsOptCommand="$OptCmd"
SettingsLlvmAsCommand="$LlvmAsCmd"
if test "$EnableDistroToolchain" = "YES"; then
# If the user specified --enable-distro-toolchain then we just use the
# executable names, not paths.
......@@ -96,6 +101,9 @@ AC_DEFUN([FP_SETTINGS],
SettingsMergeObjectsCommand="$(basename $SettingsMergeObjectsCommand)"
SettingsArCommand="$(basename $SettingsArCommand)"
SettingsWindresCommand="$(basename $SettingsWindresCommand)"
SettingsLlcCommand="$(basename $SettingsLlcCommand)"
SettingsOptCommand="$(basename $SettingsOptCommand)"
SettingsLlvmAsCommand="$(basename $SettingsLlvmAsCommand)"
fi
if test "$windows" = YES -a "$EnableDistroToolchain" = "NO"; then
......@@ -120,15 +128,11 @@ AC_DEFUN([FP_SETTINGS],
SUBST_TOOLDIR([SettingsArCommand])
SUBST_TOOLDIR([SettingsRanlibCommand])
SUBST_TOOLDIR([SettingsWindresCommand])
SUBST_TOOLDIR([SettingsLlcCommand])
SUBST_TOOLDIR([SettingsOptCommand])
SUBST_TOOLDIR([SettingsLlvmAsCommand])
fi
# LLVM backend tools
SettingsLlcCommand="$LlcCmd"
SettingsOptCommand="$OptCmd"
SettingsLlvmAsCommand="$LlvmAsCmd"
# Mac-only tools
if test -z "$OtoolCmd"; then
OtoolCmd="otool"
......
......@@ -131,6 +131,9 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[
OBJDUMP="${mingwbin}llvm-objdump.exe"
DLLTOOL="${mingwbin}llvm-dlltool.exe"
WindresCmd="${mingwbin}llvm-windres.exe"
LLC="${mingwbin}llc.exe"
OPT="${mingwbin}opt.exe"
LLVMAS="${mingwbin}clang.exe"
# N.B. LLD does not support -r
MergeObjsCmd=""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment