Address remaining nits/comments

bazelbuild · Jun 9, 2021 · 006f033 · 006f033
1 parent 601e76e
commit 006f033
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/swift/internal/compiling.bzl b/swift/internal/compiling.bzl
@@ -2190,7 +2190,6 @@ def _declare_compile_outputs(
         feature_configuration = feature_configuration,
         feature_name = SWIFT_FEATURE_INDEX_WHILE_BUILDING,
     )
-
     if (
         index_while_building and
         not _index_store_path_overridden(user_compile_flags)

diff --git a/swift/repositories.bzl b/swift/repositories.bzl
@@ -123,20 +123,6 @@ native_binary(
     out = "index-import",
     visibility = ["//visibility:public"],
 )
-
-native_binary(
-    name = "validate_index",
-    src = "validate-index",
-    out = "validate-index",
-    visibility = ["//visibility:public"],
-)
-
-native_binary(
-    name = "absolute_unit",
-    src = "absolute-unit",
-    out = "absolute-unit",
-    visibility = ["//visibility:public"],
-)
 """,
         canonical_id = "index-import-5.3.2.6",
         urls = ["https://github.com/MobileNativeFoundation/index-import/releases/download/5.3.2.6/index-import.zip"],

diff --git a/tools/worker/swift_runner.cc b/tools/worker/swift_runner.cc
@@ -130,7 +130,6 @@ int SwiftRunner::Run(std::ostream *stderr_stream, bool stdout_to_stderr) {
     exit_code = RunSubProcess(rewriter_args, stderr_stream, stdout_to_stderr);
   }
 
-  auto exec_root = GetCurrentDirectory();
   auto enable_global_index_store = global_index_store_import_path_ != "";
   if (enable_global_index_store) {
     OutputFileMap output_file_map;
@@ -160,6 +159,7 @@ int SwiftRunner::Run(std::ostream *stderr_stream, bool stdout_to_stderr) {
       }
     }
 
+    auto exec_root = GetCurrentDirectory();
     // Copy back from the global index store to bazel's index store
     ii_args.push_back(exec_root + "/" + global_index_store_import_path_);
     ii_args.push_back(exec_root + "/" + index_store_path_);