always insist in specified resolver/compiler version;
authorwenzelm
Thu Nov 08 15:52:10 2018 +0100 (6 months ago)
changeset 69267517655a528fe
parent 69266 7cc2d66a92a6
child 69268 c1a27fce2076
always insist in specified resolver/compiler version;
lib/Tools/ghc
lib/Tools/ghc_setup
lib/scripts/getfunctions
     1.1 --- a/lib/Tools/ghc	Thu Nov 08 15:49:56 2018 +0100
     1.2 +++ b/lib/Tools/ghc	Thu Nov 08 15:52:10 2018 +0100
     1.3 @@ -5,7 +5,7 @@
     1.4  # DESCRIPTION: invoke Glasgow Haskell Compiler within the Isabelle environment
     1.5  
     1.6  if [ -d "$ISABELLE_STACK_ROOT" -a -n "$ISABELLE_GHC" ]; then
     1.7 -  isabelle_stack ghc --resolver "$ISABELLE_STACK_RESOLVER" --compiler "$ISABELLE_GHC_VERSION" -- "$@"
     1.8 +  isabelle_stack ghc -- "$@"
     1.9  else
    1.10    echo "Cannot execute ghc: missing Isabelle GHC setup" >&2
    1.11    exit 127
     2.1 --- a/lib/Tools/ghc_setup	Thu Nov 08 15:49:56 2018 +0100
     2.2 +++ b/lib/Tools/ghc_setup	Thu Nov 08 15:52:10 2018 +0100
     2.3 @@ -6,6 +6,6 @@
     2.4  
     2.5  set -e
     2.6  
     2.7 -isabelle_stack setup --resolver "$ISABELLE_STACK_RESOLVER" "$ISABELLE_GHC_VERSION"
     2.8 -isabelle_stack ghci --ghci-options --version
     2.9 +isabelle_stack setup
    2.10 +isabelle_stack ghc -- --version
    2.11  echo -n "$(standard_path "$(isabelle_stack path --programs)")" > "$ISABELLE_STACK_ROOT/ISABELLE_GHC_PROGRAMS"
     3.1 --- a/lib/scripts/getfunctions	Thu Nov 08 15:49:56 2018 +0100
     3.2 +++ b/lib/scripts/getfunctions	Thu Nov 08 15:52:10 2018 +0100
     3.3 @@ -46,7 +46,7 @@
     3.4      echo "Unknown ISABELLE_STACK -- GHC management tools unavailable" >&2
     3.5      return 127
     3.6    else
     3.7 -    env STACK_ROOT="$(platform_path "$ISABELLE_STACK_ROOT")" "$ISABELLE_STACK" "$@"
     3.8 +    env STACK_ROOT="$(platform_path "$ISABELLE_STACK_ROOT")" "$ISABELLE_STACK" --resolver "$ISABELLE_STACK_RESOLVER" --compiler "$ISABELLE_GHC_VERSION" "$@"
     3.9    fi
    3.10  }
    3.11  export -f isabelle_stack