Skip to content

Commit

Permalink
Avoid wildcard expansion when making F# builds
Browse files Browse the repository at this point in the history
This fixes a regression introduced in
af1b98d

Before the regression there was the term:
  --already_cached '*,'

The regression switched it to:
  --already_cached '*'

which causes:

  Y:/source/FStar/src/ocaml-output/fstar/bin/fstar.exe   --use_hints   --warn_error @241 --cache_checked_modules --odir fs/extracted --cache_dir .cache --already_cached '*' FStar.Pervasives.fst --codegen FSharp --extract_module FStar.Pervasives
  * Error 151:
    - Not a valid FStar file: '..'

  1 error was reported (see above)
  make: *** [Makefile.extract.fsharp:34: fs/extracted/FStar_Pervasives.fs] Error 1

This fix puts back the original trailing comma which inhibits the
wildcard expansion.
  • Loading branch information
jonahbeckford committed Aug 28, 2024
1 parent b2e21e3 commit 18f5b10
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ulib/Makefile.extract.fsharp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ MY_FSTAR=$(FSTAR) $(OTHERFLAGS) --warn_error @241 --cache_checked_modules --odir
# And then, in a separate invocation, from each .checked file we
# extract an .fs file
$(OUTPUT_DIRECTORY)/%.fs:
$(MY_FSTAR) --already_cached '*' $(subst .checked,,$(notdir $<)) --codegen $(CODEGEN) --extract_module $(basename $(notdir $(subst .checked,,$<)))
$(MY_FSTAR) --already_cached '*,' $(subst .checked,,$(notdir $<)) --codegen $(CODEGEN) --extract_module $(basename $(notdir $(subst .checked,,$<)))

.depend.extract.fsharp:
$(call msg, "DEPEND")
Expand Down

0 comments on commit 18f5b10

Please sign in to comment.