--- 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
--- 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