more robust reference to ghc exe (with multi-platform support);
authorwenzelm
Wed Mar 20 21:57:02 2019 +0100 (4 weeks ago)
changeset 69930b5286c564861
parent 69929 b979e3044d8e
child 69931 31ee094dea3d
more robust reference to ghc exe (with multi-platform support);
lib/Tools/ghc_setup
lib/scripts/getsettings
     1.1 --- a/lib/Tools/ghc_setup	Wed Mar 20 21:54:08 2019 +0100
     1.2 +++ b/lib/Tools/ghc_setup	Wed Mar 20 21:57:02 2019 +0100
     1.3 @@ -8,4 +8,4 @@
     1.4  
     1.5  isabelle_stack setup
     1.6  isabelle_stack ghc -- --version
     1.7 -echo -n "$(standard_path "$(isabelle_stack path --programs)")" > "$ISABELLE_STACK_ROOT/ISABELLE_GHC_PROGRAMS"
     1.8 +echo -n "$(standard_path "$(isabelle_stack path --compiler-exe)")" > "$ISABELLE_STACK_ROOT/ISABELLE_GHC_EXE-$ISABELLE_PLATFORM_FAMILY"
     2.1 --- a/lib/scripts/getsettings	Wed Mar 20 21:54:08 2019 +0100
     2.2 +++ b/lib/scripts/getsettings	Wed Mar 20 21:57:02 2019 +0100
     2.3 @@ -105,8 +105,8 @@
     2.4  fi
     2.5  
     2.6  #enforce ISABELLE_GHC
     2.7 -if [ -d "$ISABELLE_STACK_ROOT" -a -f "$ISABELLE_STACK_ROOT/ISABELLE_GHC_PROGRAMS" ]; then
     2.8 -  if [ -f "$(cat "$ISABELLE_STACK_ROOT/ISABELLE_GHC_PROGRAMS")/$ISABELLE_GHC_VERSION/bin/ghc" ]; then
     2.9 +if [ -f "$ISABELLE_STACK_ROOT/ISABELLE_GHC_EXE-$ISABELLE_PLATFORM_FAMILY" ]; then
    2.10 +  if [ -f "$(cat "$ISABELLE_STACK_ROOT/ISABELLE_GHC_EXE-$ISABELLE_PLATFORM_FAMILY")" ]; then
    2.11      ISABELLE_GHC="$ISABELLE_HOME/lib/scripts/ghc"
    2.12      ISABELLE_GHC_STACK=true
    2.13    fi