Generate non recursive LIBRARY_SEARCH_PATHS paths

Only for transitive deps with a .a output file

Signed-off-by: Karim Alweheshy <[email protected]>

Author: Karim Alweheshy

tools/generators/pbxnativetargets/src/Generator/CalculatePlatformVariantBuildSettings.swift

@@ -183,6 +183,18 @@ extension Generator.CalculatePlatformVariantBuildSettings {
             )
         }
 
+        buildSettings.append(
+            .init(
+                key: "LIBRARY_SEARCH_PATHS",
+                value: platformVariant.librarySearchPaths
+                    .map { $0.path.quoteIfNeeded }
+                    // TODO: See if we can not sort, or sort earlier
+                    .sorted()
+                    .joined(separator: " ")
+                    .pbxProjEscaped
+            )
+        )
+
         buildSettings.append(contentsOf: platformVariant.buildSettingsFromFile)
 
         return buildSettings

tools/generators/pbxnativetargets/src/Generator/CalculatePlatformVariants.swift

@@ -134,7 +134,8 @@ extension Generator.CalculatePlatformVariants {
                         .flatMap { unitTestHosts[$0] },
                     dSYMPathsBuildSetting:
                         targetArguments.dSYMPathsBuildSetting.isEmpty ?
-                    nil : targetArguments.dSYMPathsBuildSetting
+                    nil : targetArguments.dSYMPathsBuildSetting,
+                    librarySearchPaths: Set(targetArguments.librarySearchPaths)
                 )
             )
         }

tools/generators/pbxnativetargets/src/Generator/CalculateXcodeConfigurationBuildSettings.swift

@@ -236,7 +236,7 @@ private extension Platform {
     }
 }
 
-private extension String {
+extension String {
     var quoteIfNeeded: String {
         guard !contains(" ") else {
             return #""\#(self)""#

tools/generators/pbxnativetargets/src/Generator/Target.swift

@@ -33,6 +33,7 @@ enum Target {
         let linkParams: String?
         let unitTestHost: UnitTestHost?
         let dSYMPathsBuildSetting: String?
+        let librarySearchPaths: Set<BazelPath>
     }
 
     struct UnitTestHost: Equatable {

tools/generators/pbxnativetargets/src/Generator/TargetArguments.swift

@@ -29,6 +29,7 @@ struct TargetArguments: Equatable {
     let nonArcSrcs: [BazelPath]
 
     let dSYMPathsBuildSetting: String
+    let librarySearchPaths: [BazelPath]
 }
 
 extension Dictionary<TargetID, TargetArguments> {
@@ -92,6 +93,11 @@ extension Dictionary<TargetID, TargetArguments> {
                 "xcode-configurations",
                 in: url
             )
+            let librarySearchPaths = try rawArgs.consumeArgs(
+                "library-search-paths",
+                as: BazelPath.self,
+                in: url
+            )
 
             var buildSettings: [PlatformVariantBuildSetting] = []
             if let buildSettingsFile {
@@ -130,7 +136,8 @@ extension Dictionary<TargetID, TargetArguments> {
                         hasCxxParams: hasCxxParams,
                         srcs: srcs,
                         nonArcSrcs: nonArcSrcs,
-                        dSYMPathsBuildSetting: dSYMPathsBuildSetting
+                        dSYMPathsBuildSetting: dSYMPathsBuildSetting,
+                        librarySearchPaths: librarySearchPaths
                     )
                 )
             )

xcodeproj/internal/files/linker_input_files.bzl

@@ -63,14 +63,44 @@ def _collect_linker_inputs(
         )
         top_level_values = None
 
+    all_libs = objc_libraries + [
+        lib.static_library if lib.static_library else lib.dynamic_library
+        for linker_input in cc_linker_inputs
+        for lib in linker_input.libraries
+    ]
+
+    libraries = [
+        lib
+        for lib in all_libs
+        if lib.basename.endswith(".a")
+    ]
+
+    linker_inputs_for_libs_search_paths = depset([
+        lib.dirname
+        for lib in libraries
+    ])
+
+    _framework_files = depset([
+        lib.basename
+        for lib in libraries
+    ])
+
     return struct(
         _cc_linker_inputs = tuple(cc_linker_inputs),
         _compilation_providers = compilation_providers,
         _objc_libraries = tuple(objc_libraries),
         _primary_static_library = primary_static_library,
         _top_level_values = top_level_values,
+        _linker_inputs_for_libs_search_paths = linker_inputs_for_libs_search_paths,
+        _framework_files = _framework_files,
     )
 
+def _extract_linker_inputs_for_libs_search_paths(linker_inputs):
+    return linker_inputs._linker_inputs_for_libs_search_paths
+
+def _extract_framework_file_names(linker_inputs):
+    return linker_inputs._framework_files
+
 def _merge_linker_inputs(*, compilation_providers):
     return _collect_linker_inputs(
         target = None,
@@ -386,4 +416,6 @@ linker_input_files = struct(
         _get_transitive_static_libraries_for_bwx
     ),
     to_input_files = _to_input_files,
+    get_linker_inputs_for_libs_search_paths = _extract_linker_inputs_for_libs_search_paths,
+    get_framework_file_names = _extract_framework_file_names,
 )

xcodeproj/internal/incremental_xcode_targets.bzl

@@ -83,7 +83,8 @@ def _make_incremental_xcode_target(
         test_host = None,
         transitive_dependencies,
         unfocus_if_not_test_host = False,
-        watchkit_extension = None):
+        watchkit_extension = None,
+        linker_inputs_for_libs_search_paths):
     """Creates the internal data structure of the `xcode_targets` module.
 
     Args:
@@ -167,6 +168,7 @@ def _make_incremental_xcode_target(
         test_host = test_host,
         watchkit_extension = watchkit_extension,
         transitive_dependencies = transitive_dependencies,
+        linker_inputs_for_libs_search_paths = linker_inputs_for_libs_search_paths,
     )
 
 def _merge_xcode_inputs(*, dest_inputs, mergeable_info):

xcodeproj/internal/pbxproj_partials.bzl

@@ -316,6 +316,12 @@ def _write_consolidation_map_targets(
                 terminate_with = "",
             )
 
+            targets_args.add_all(
+                xcode_target.linker_inputs_for_libs_search_paths.to_list(),
+                omit_if_empty = False,
+                terminate_with = "",
+            )
+
             # `outputs.product_path` is only set for top-level targets
             if xcode_target.outputs.product_path:
                 top_level_targets_args.add(xcode_target.id)
@@ -1095,7 +1101,8 @@ def _write_target_build_settings(
         swift_args,
         swift_debug_settings_to_merge = EMPTY_DEPSET,
         team_id = None,
-        tool):
+        tool,
+        linker_inputs_for_libs_search_paths = EMPTY_DEPSET):
     """Creates the `OTHER_SWIFT_FLAGS` build setting string file for a target.
 
     Args:

xcodeproj/internal/processed_targets/incremental_library_targets.bzl

@@ -231,6 +231,8 @@ def _process_incremental_library_target(
             platform = platform,
             product = product.xcode_product,
             transitive_dependencies = transitive_dependencies,
+            linker_inputs_for_libs_search_paths = linker_input_files
+                .get_linker_inputs_for_libs_search_paths(linker_inputs),
         )
     else:
         mergeable_infos = depset(

xcodeproj/internal/processed_targets/incremental_top_level_targets.bzl

@@ -628,6 +628,8 @@ def _process_focused_top_level_target(
             transitive_dependencies = transitive_dependencies,
             unfocus_if_not_test_host = unfocus_if_not_test_host,
             watchkit_extension = watchkit_extension,
+            linker_inputs_for_libs_search_paths = linker_input_files
+                .get_linker_inputs_for_libs_search_paths(linker_inputs),
         ),
     )