--- a/lib/Tools/ghc Thu Nov 08 15:49:56 2018 +0100
+++ b/lib/Tools/ghc Thu Nov 08 15:52:10 2018 +0100
@@ -5,7 +5,7 @@
# DESCRIPTION: invoke Glasgow Haskell Compiler within the Isabelle environment
if [ -d "$ISABELLE_STACK_ROOT" -a -n "$ISABELLE_GHC" ]; then
- isabelle_stack ghc --resolver "$ISABELLE_STACK_RESOLVER" --compiler "$ISABELLE_GHC_VERSION" -- "$@"
+ isabelle_stack ghc -- "$@"
else
echo "Cannot execute ghc: missing Isabelle GHC setup" >&2
exit 127
--- a/lib/Tools/ghc_setup Thu Nov 08 15:49:56 2018 +0100
+++ b/lib/Tools/ghc_setup Thu Nov 08 15:52:10 2018 +0100
@@ -6,6 +6,6 @@
set -e
-isabelle_stack setup --resolver "$ISABELLE_STACK_RESOLVER" "$ISABELLE_GHC_VERSION"
-isabelle_stack ghci --ghci-options --version
+isabelle_stack setup
+isabelle_stack ghc -- --version
echo -n "$(standard_path "$(isabelle_stack path --programs)")" > "$ISABELLE_STACK_ROOT/ISABELLE_GHC_PROGRAMS"
--- a/lib/scripts/getfunctions Thu Nov 08 15:49:56 2018 +0100
+++ b/lib/scripts/getfunctions Thu Nov 08 15:52:10 2018 +0100
@@ -46,7 +46,7 @@
echo "Unknown ISABELLE_STACK -- GHC management tools unavailable" >&2
return 127
else
- env STACK_ROOT="$(platform_path "$ISABELLE_STACK_ROOT")" "$ISABELLE_STACK" "$@"
+ env STACK_ROOT="$(platform_path "$ISABELLE_STACK_ROOT")" "$ISABELLE_STACK" --resolver "$ISABELLE_STACK_RESOLVER" --compiler "$ISABELLE_GHC_VERSION" "$@"
fi
}
export -f isabelle_stack