More setting FSTAR_EXE

project-everest · Jan 8, 2025 · cc0d06f · cc0d06f
1 parent 5395597
commit cc0d06f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.docker/build/install-deps.sh b/.docker/build/install-deps.sh
@@ -16,6 +16,7 @@ FSTAR_BRANCH=$(jq -c -r '.BranchName' "$build_home"/config.json)
 git clone --branch $FSTAR_BRANCH https://github.com/mtzguido/FStar "$FSTAR_DIR"
 opam install --deps-only "$FSTAR_DIR/fstar.opam"
 OTHERFLAGS='--admit_smt_queries true' make -j 24 -C "$FSTAR_DIR"
+export FSTAR_EXE="$FSTAR_DIR/bin/fstar.exe"
 
 # Install other EverParse deps
 "$build_home"/install-other-deps.sh
diff --git a/src/package/package.sh b/src/package/package.sh
@@ -122,6 +122,8 @@ make_everparse() {
     else
         export FSTAR_HOME=$(fixpath "$FSTAR_HOME")
     fi
+    export FSTAR_EXE=$FSTAR_HOME/bin/fstar.exe
+
     if [[ -z "$KRML_HOME" ]] ; then
         { [[ -d karamel ]] || git clone https://github.com/FStarLang/karamel ; }
         export KRML_HOME=$(fixpath $PWD/karamel)
@@ -146,8 +148,8 @@ make_everparse() {
         $MAKE -C "$FSTAR_HOME" "$@"
     fi
     if [[ -z "$fstar_commit_id" ]] ; then
-        fstar_commit_id=$("$FSTAR_HOME/bin/fstar.exe" --version | grep '^commit=' | sed 's!^.*=!!')
-        fstar_commit_date_hr=$("$FSTAR_HOME/bin/fstar.exe" --version | grep '^date=' | sed 's!^.*=!!')
+        fstar_commit_id=$("$FSTAR_EXE" --version | grep '^commit=' | sed 's!^.*=!!')
+        fstar_commit_date_hr=$("$FSTAR_EXE" --version | grep '^date=' | sed 's!^.*=!!')
     fi
     if $is_windows ; then
         # FIXME: krmllib cannot be built on Windows because the krmllib Makefiles use Cygwin paths, which cannot be used by the krml executable
@@ -213,11 +215,11 @@ make_everparse() {
       # we have a F* source tree
       # TODO: create some `install-minimal` rule in the F* Makefile
       everparse_package_dir=$(fixpath "$(pwd)/everparse")
-      $cp $FSTAR_HOME/bin/fstar.exe everparse/bin/
+      $cp $FSTAR_EXE everparse/bin/
       PREFIX="$everparse_package_dir" $MAKE -C $FSTAR_HOME/ulib install
     else
       # we have a F* binary package, or opam package
-      $cp $FSTAR_HOME/bin/fstar.exe everparse/bin/
+      $cp $FSTAR_EXE everparse/bin/
       mkdir everparse/lib
       $cp -r $FSTAR_HOME/lib/fstar everparse/lib/fstar
     fi