From 6755b56cf73c330409fc9b17d1e25dd94b353d7d Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Tue, 6 Sep 2022 11:54:05 -0500 Subject: [PATCH] Remove space-in-path replacement This replacement causes issues with importing indexstores. In 965c37304cbc0263b6a5b0a945529c66a593c34c this replacement was added to work around issues with `ar_wrapper`. I don't see `ar_wrapper` used anywhere in Bazel, so I believe this is safe to remove. --- swift/internal/derived_files.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/swift/internal/derived_files.bzl b/swift/internal/derived_files.bzl index ddf57d7a7..cc09bf8d4 100644 --- a/swift/internal/derived_files.bzl +++ b/swift/internal/derived_files.bzl @@ -113,10 +113,10 @@ def _intermediate_frontend_file_path(target_name, src): """ objs_dir = "{}_objs".format(target_name) - owner_rel_path = owner_relative_path(src).replace(" ", "__SPACE__") - safe_name = paths.basename(owner_rel_path) + owner_rel_path = owner_relative_path(src) + basename = paths.basename(owner_rel_path) - return paths.join(objs_dir, paths.dirname(owner_rel_path)), safe_name + return paths.join(objs_dir, paths.dirname(owner_rel_path)), basename def _intermediate_object_file(actions, target_name, src): """Declares a file for an intermediate object file during compilation.