diff --git a/prelude/apple/apple_library.bzl b/prelude/apple/apple_library.bzl
index ce40d598dbd75..af54003ffcfa1 100644
--- a/prelude/apple/apple_library.bzl
+++ b/prelude/apple/apple_library.bzl
@@ -182,7 +182,7 @@ def apple_library_impl(ctx: AnalysisContext) -> [Promise, list[Provider]]:
     else:
         return get_apple_library_providers([])
 
-def _compile_index_store(ctx: AnalysisContext, src_compile_cmd: CxxSrcCompileCommand, toolchain: CxxToolchainInfo, compile_cmd: cmd_args, pic: bool) -> Artifact | None:
+def _compile_index_store(ctx: AnalysisContext, src_compile_cmd: CxxSrcCompileCommand, toolchain: CxxToolchainInfo, compile_cmd: cmd_args) -> Artifact | None:
     identifier = src_compile_cmd.src.short_path
     if src_compile_cmd.index != None:
         # Add a unique postfix if we have duplicate source files with different flags
@@ -190,10 +190,6 @@ def _compile_index_store(ctx: AnalysisContext, src_compile_cmd: CxxSrcCompileCom
     filename_base = identifier
     identifier += " (index_store)"
 
-    # We generate the index only for pic compilations
-    if not pic:
-        return None
-
     if src_compile_cmd.src.extension in AsmExtensions.values():
         return None
 
diff --git a/prelude/cxx/compile.bzl b/prelude/cxx/compile.bzl
index 154613f637c66..d9325756eb9cd 100644
--- a/prelude/cxx/compile.bzl
+++ b/prelude/cxx/compile.bzl
@@ -407,9 +407,9 @@ def create_compile_cmds(
         comp_db_compile_cmds = src_compile_cmds + hdr_compile_cmds,
     )
 
-def _compile_index_store(ctx: AnalysisContext, src_compile_cmd: CxxSrcCompileCommand, toolchain: CxxToolchainInfo, compile_cmd: cmd_args, pic: bool) -> Artifact | None:
+def _compile_index_store(ctx: AnalysisContext, src_compile_cmd: CxxSrcCompileCommand, toolchain: CxxToolchainInfo, compile_cmd: cmd_args) -> Artifact | None:
     if src_compile_cmd.index_store_factory:
-        return src_compile_cmd.index_store_factory(ctx, src_compile_cmd, toolchain, compile_cmd, pic)
+        return src_compile_cmd.index_store_factory(ctx, src_compile_cmd, toolchain, compile_cmd)
     return None
 
 COMMON_PREPROCESSOR_OUTPUT_ARGS = cmd_args("-E", "-dD")
@@ -554,7 +554,11 @@ def _compile_single_cxx(
         src_compile_cmd = src_compile_cmd,
         pic = pic,
     )
-    index_store = _compile_index_store(ctx, src_compile_cmd, toolchain, compile_index_store_cmd, pic)
+
+    index_store = None
+
+    if pic:
+        index_store = _compile_index_store(ctx, src_compile_cmd, toolchain, compile_index_store_cmd)
 
     # Generate asm for compiler which accept `-S` (TODO: support others)
     if compiler_type in ["clang", "gcc"]: