Revert "src: Use fstar.include for bootstrapping"

This reverts commit 8a850694aed6f2b732d40b8530714f7d94396d71.
mtzguido · Sep 5, 2024 · 08c7e03 · 08c7e03
1 parent 6f2b26f
commit 08c7e03
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 17 deletions.
diff --git a/src/FStarCompiler.fst.config.json b/src/FStarCompiler.fst.config.json
@@ -10,6 +10,21 @@
     "-271-272-241-319-274"
   ],
   "include_dirs": [
-    "../ulib"
+    "../ulib",
+    "basic",
+    "class",
+    "data",
+    "extraction",
+    "fstar",
+    "parser",
+    "prettyprint",
+    "reflection",
+    "smtencoding",
+    "syntax",
+    "syntax/print",
+    "tactics",
+    "tosyntax",
+    "typechecker",
+    "tests"
   ]
 }
diff --git a/src/Makefile.boot.common b/src/Makefile.boot.common
@@ -2,11 +2,28 @@
 # Makefile.boot includes it too for bootstrapping
 # Makefiles that include it should define FSTAR_HOME before the include
 
+INCLUDE_PATHS = \
+	basic \
+	class \
+	data \
+	extraction \
+	fstar \
+	parser \
+	prettyprint \
+	reflection \
+	smtencoding \
+	syntax \
+	syntax/print \
+	tactics \
+	tosyntax \
+	typechecker \
+	tests
+
 CACHE_DIR?=$(FSTAR_HOME)/src/.cache.boot
 
 # 274, else we get a warning for shadowing parse.fsi, when opening FStar.Parser namespace
 
-FSTAR_BOOT_OPTIONS=$(OTHERFLAGS) --lax --no_location_info --warn_error -271-272-241-319-274 --cache_dir $(CACHE_DIR)
+FSTAR_BOOT_OPTIONS=$(OTHERFLAGS) --lax --no_location_info --warn_error -271-272-241-319-274 --cache_dir $(CACHE_DIR) $(addprefix --include , $(addprefix $(FSTAR_HOME)/src/,$(INCLUDE_PATHS)))
 
 %.fsti-in %.fst-in:
 	@echo $(FSTAR_BOOT_OPTIONS)
diff --git a/src/fstar.include b/src/fstar.include