[Git][ghc/ghc][wip/windows-topdir] Revert "Apply shellcheck suggestion to SUBST_TOOLDIR"

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/windows-topdir at Glasgow Haskell Compiler / GHC


Commits:
ae112bbb by Zubin Duggal at 2024-03-18T09:47:30+00:00
Revert "Apply shellcheck suggestion to SUBST_TOOLDIR"

This reverts commit c82770f57977a2b5add6e1378f234f8dd6153392.

The shellcheck suggestion is spurious and results in SUBST_TOOLDIR being a
no-op. `set` sets positional arguments for bash, but we want to set the variable
given as the first autoconf argument.

Fixes #24542

Metric decreases because the paths in the settings file are now shorter,
so we allocate less when we read the settings file.

-------------------------
Metric Decrease:
    T12425
    T13035
    T9198
-------------------------

- - - - -


1 changed file:

- m4/fp_settings.m4


Changes:

=====================================
m4/fp_settings.m4
=====================================
@@ -44,7 +44,7 @@ dnl ghc-toolchain.
 AC_DEFUN([SUBST_TOOLDIR],
 [
     dnl and Note [How we configure the bundled windows toolchain]
-set -- "$(echo "$$1" | sed 's%'"$mingw_prefix"'%'"$mingw_install_prefix"'%g')"
+    $1=`echo "$$1" | sed 's%'"$mingw_prefix"'%'"$mingw_install_prefix"'%g'`
 ])
 
 # FP_SETTINGS



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ae112bbbbd8c7db7fbc677e589d9803b5e47de2a
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/20240318/a3e10133/attachment.html>