# HG changeset patch
# User wenzelm
# Date 1539808611 -7200
# Node ID 22ae1d926f9644aafb88d3d34e1f52627ae1a3f0
# Parent  e8ef77b7e1a033bda7e8ed24dbfa7deeefb5df47
more portable;

diff -r e8ef77b7e1a0 -r 22ae1d926f96 lib/scripts/getfunctions
--- a/lib/scripts/getfunctions	Wed Oct 17 22:21:01 2018 +0200
+++ b/lib/scripts/getfunctions	Wed Oct 17 22:36:51 2018 +0200
@@ -13,10 +13,12 @@
 
 if [ "$OSTYPE" = cygwin ]; then
   function platform_path() { cygpath -i -C UTF8 -w -p "$@"; }
+  function standard_path() { cygpath -i -u -p "$@" | tr -d '\r'; }
 else
   function platform_path() { echo "$@"; }
+  function standard_path() { echo "$@"; }
 fi
-export -f platform_path
+export -f platform_path standard_path
 
 #GNU tar (notably on Mac OS X)
 if type -p gnutar >/dev/null
diff -r e8ef77b7e1a0 -r 22ae1d926f96 lib/scripts/getsettings
--- a/lib/scripts/getsettings	Wed Oct 17 22:21:01 2018 +0200
+++ b/lib/scripts/getsettings	Wed Oct 17 22:36:51 2018 +0200
@@ -111,7 +111,7 @@
 
 #enforce ISABELLE_GHC
 if [ -d "$ISABELLE_STACK_ROOT" ]; then
-  if [ -f "$(isabelle_stack path --programs)/$ISABELLE_GHC_VERSION/bin/ghc" ]; then
+  if [ -f "$(standard_path "$(isabelle_stack path --programs)")/$ISABELLE_GHC_VERSION/bin/ghc" ]; then
     ISABELLE_GHC="$ISABELLE_HOME/lib/Tools/ghc"
   fi
 fi