start using custom builtin.odin for builtin procedures

2 files changed, 9 insertions, 2 deletions

diff --git a/src/index/build.odin b/src/index/build.odin
index 26b1cb2..e206b90 100644
--- a/src/index/build.odin
+++ b/src/index/build.odin
@@ -1,6 +1,7 @@
 package index
 
 import "core:path/filepath"
+import "core:path"
 import "core:os"
 import "core:fmt"
 import "core:odin/parser"
@@ -72,6 +73,13 @@ build_static_index :: proc(allocator := context.allocator, config: ^common.Confi
 		filepath.walk(v, walk_static_index_build);
 	}
 
+	slashed, _ := filepath.to_slash(os.get_current_directory(context.temp_allocator), context.temp_allocator);
+	builtin_package := path.join(elems = {slashed, "builtin"}, allocator = context.temp_allocator);
+
+	append(&indexer.built_in_packages, strings.to_lower(builtin_package));
+
+	filepath.walk(builtin_package, walk_static_index_build);
+
 	context.allocator = context.temp_allocator;
 
 	for fullpath in files {
diff --git a/src/server/requests.odin b/src/server/requests.odin
index 6085115..fe2aab0 100644
--- a/src/server/requests.odin
+++ b/src/server/requests.odin
@@ -516,11 +516,10 @@ request_initialize :: proc (task: ^common.Task) {
 	index.build_static_index(context.allocator, config);
 
 	/*
-		Add the builtin and runtime package
+		Add runtime package
 	*/
 
 	if core, ok := config.collections["core"]; ok {
-		append(&index.indexer.built_in_packages, path.join(strings.to_lower(core, context.temp_allocator), "builtin"));
 		append(&index.indexer.built_in_packages, path.join(strings.to_lower(core, context.temp_allocator), "runtime"));
 	}