[Git][ghc/ghc][master] Use bundled llc/opt on Windows (#22438)

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
92976985 by ARATA Mizuki at 2024-10-02T22:22:35-04:00
Use bundled llc/opt on Windows (#22438)

- - - - -


2 changed files:

- m4/fp_settings.m4
- m4/fp_setup_windows_toolchain.m4


Changes:

=====================================
m4/fp_settings.m4
=====================================
@@ -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"


=====================================
m4/fp_setup_windows_toolchain.m4
=====================================
@@ -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=""



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/92976985625ffba551f1e1422f5e3a0cbf7beb89

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/92976985625ffba551f1e1422f5e3a0cbf7beb89
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241002/15e82156/attachment-0001.html>