Commit 7debffc1 authored by Ben Gamari's avatar Ben Gamari 🐢

Don't use uname -o

Summary:
It's not required by the POSIX specification and OS X doesn't support
it; instead use uname -s.

Test Plan: V

Reviewers: O26 nofib, michalt, mpickering

Reviewed By: O26 nofib, michalt, mpickering

Subscribers: mpickering

GHC Trac Issues: #13711

Differential Revision: https://phabricator.haskell.org/D3594
parent c7e6c907
......@@ -23,7 +23,7 @@ CONTEXT_DIFF_RAW = diff -U 1
EXECUTABLE_FILE = chmod +x
# Windows MSYS specific settings
ifeq ($(shell uname -o), Msys)
ifeq ($(shell uname -s | grep -c MSYS), 1)
exeext=.exe
CONTEXT_DIFF=$(CONTEXT_DIFF_RAW) --strip-trailing-cr
else
......
......@@ -57,7 +57,7 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names
}
$cmp = "cmp -s";
# If this is Msys, ignore eol and CR characters.
if ( `uname -o | grep Msys` ) {
if ( `uname -s | grep MSYS` ) {
$CONTEXT_DIFF=$CONTEXT_DIFF . " --strip-trailing-cr" ;
$cmp = $CONTEXT_DIFF . " -q";
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment