Rodrigo Mesquita pushed to branch wip/romes/24212 at Glasgow Haskell Compiler / GHC Commits: 2a21169e by Rodrigo Mesquita at 2025-07-10T14:38:27+01:00 SettingsInstallNameToolCommand - - - - - 8f884d02 by Rodrigo Mesquita at 2025-07-10T14:38:48+01:00 SettingsRanlibCommand - - - - - e0069f27 by Rodrigo Mesquita at 2025-07-10T14:39:20+01:00 SettingsWindresCommand - - - - - c7b8104a by Rodrigo Mesquita at 2025-07-10T14:39:47+01:00 SettingsLibtool - - - - - 1b728ca6 by Rodrigo Mesquita at 2025-07-10T14:40:09+01:00 SettingsLlc - - - - - fc27122c by Rodrigo Mesquita at 2025-07-10T14:40:31+01:00 SettingsOptCommand - - - - - 65684172 by Rodrigo Mesquita at 2025-07-10T14:41:01+01:00 SettingsLlvmAs - - - - - 2 changed files: - hadrian/bindist/config.mk.in - m4/fp_settings.m4 Changes: ===================================== hadrian/bindist/config.mk.in ===================================== @@ -205,11 +205,3 @@ TargetHasLibm = @TargetHasLibm@ TablesNextToCode = @TablesNextToCode@ LeadingUnderscore = @LeadingUnderscore@ LlvmTarget = @LlvmTarget@ - -SettingsInstallNameToolCommand = @SettingsInstallNameToolCommand@ -SettingsRanlibCommand = @SettingsRanlibCommand@ -SettingsWindresCommand = @SettingsWindresCommand@ -SettingsLibtoolCommand = @SettingsLibtoolCommand@ -SettingsLlcCommand = @SettingsLlcCommand@ -SettingsOptCommand = @SettingsOptCommand@ -SettingsLlvmAsCommand = @SettingsLlvmAsCommand@ ===================================== m4/fp_settings.m4 ===================================== @@ -52,29 +52,13 @@ AC_DEFUN([SUBST_TOOLDIR], # Set the variables used in the settings file AC_DEFUN([FP_SETTINGS], [ - SettingsRanlibCommand="$RanlibCmd" - - if test -z "$WindresCmd"; then - SettingsWindresCommand="/bin/false" - else - SettingsWindresCommand="$WindresCmd" - fi - # LLVM backend tools - SettingsLlcCommand="$LlcCmd" - SettingsOptCommand="$OptCmd" - SettingsLlvmAsCommand="$LlvmAsCmd" - SettingsLlvmAsFlags="$LlvmAsFlags" if test "$EnableDistroToolchain" = "YES"; then # If the user specified --enable-distro-toolchain then we just use the # executable names, not paths. dnl XXX="$(basename XXX)" SettingsLdCommand="$(basename $SettingsLdCommand)" - SettingsWindresCommand="$(basename $SettingsWindresCommand)" - SettingsLlcCommand="$(basename $SettingsLlcCommand)" - SettingsOptCommand="$(basename $SettingsOptCommand)" - SettingsLlvmAsCommand="$(basename $SettingsLlvmAsCommand)" fi if test "$windows" = YES -a "$EnableDistroToolchain" = "NO"; then @@ -82,22 +66,7 @@ AC_DEFUN([FP_SETTINGS], # We need to issue a substitution to use $tooldir, # See Note [tooldir: How GHC finds mingw on Windows] dnl SUBST_TOOLDIR([XXX]) - SUBST_TOOLDIR([SettingsRanlibCommand]) - SUBST_TOOLDIR([SettingsWindresCommand]) - SUBST_TOOLDIR([SettingsLlcCommand]) - SUBST_TOOLDIR([SettingsOptCommand]) - SUBST_TOOLDIR([SettingsLlvmAsCommand]) - SUBST_TOOLDIR([SettingsLlvmAsFlags]) fi - SettingsInstallNameToolCommand="$InstallNameToolCmd" - AC_SUBST(EnableDistroToolchain) - AC_SUBST(SettingsRanlibCommand) - AC_SUBST(SettingsInstallNameToolCommand) - AC_SUBST(SettingsWindresCommand) - AC_SUBST(SettingsLlcCommand) - AC_SUBST(SettingsOptCommand) - AC_SUBST(SettingsLlvmAsCommand) - AC_SUBST(SettingsLlvmAsFlags) ]) View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dd6c7339c9d12d6e0da4eb01856244d... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dd6c7339c9d12d6e0da4eb01856244d... You're receiving this email because of your account on gitlab.haskell.org.