[Git][ghc/ghc][wip/bindist-install] 2 commits: hadrian: Drop diagnostics output from bindist installation

[Ben Gamari (@bgamari)]

Ben Gamari pushed to branch wip/bindist-install at Glasgow Haskell Compiler / GHC


Commits:
c29f4e57 by Ben Gamari at 2022-08-07T18:24:06-04:00
hadrian: Drop diagnostics output from bindist installation

- - - - -
e47fb9b0 by Ben Gamari at 2022-08-07T23:20:49-04:00
gitlab-ci: Don't use coreutils on Darwin

In general we want to ensure that the tested environment is as similar
as possible to the environment the user will use. In the case of Darwin,
this means we want to use the system's BSD command-line utilities, not
coreutils.

This would have caught #21974.

- - - - -


2 changed files:

- .gitlab/darwin/toolchain.nix
- hadrian/bindist/Makefile


Changes:

=====================================
.gitlab/darwin/toolchain.nix
=====================================
@@ -85,7 +85,6 @@ pkgs.writeTextFile {
     export PATH
     PATH="${pkgs.autoconf}/bin:$PATH"
     PATH="${pkgs.automake}/bin:$PATH"
-    PATH="${pkgs.coreutils}/bin:$PATH"
     export FONTCONFIG_FILE=${fonts}
     export XELATEX="${ourtexlive}/bin/xelatex"
     export MAKEINDEX="${ourtexlive}/bin/makeindex"


=====================================
hadrian/bindist/Makefile
=====================================
@@ -39,7 +39,6 @@ endif
 # of program names. For hadrian build this will work as programs have a
 # consistent naming procedure.
 define installscript
-	echo "installscript $1 -> $2"
 	@if [ -L 'wrappers/$1' ]; then                \
 		$(CP) -RP 'wrappers/$1' '$2' ;            \
     else                                          \



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d0613678fd502fdef86f7729fb450f16100862ea...e47fb9b0932848b5cb986b6274756e762db165a1

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d0613678fd502fdef86f7729fb450f16100862ea...e47fb9b0932848b5cb986b6274756e762db165a1
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/20220807/d0774be9/attachment-0001.html>