Commit 4acf59d4 authored by Samuel Giddins's avatar Samuel Giddins

[PodTarget] Place generated module maps for static libraries in the public headers path

parent cd554f43
...@@ -158,11 +158,7 @@ module Pod ...@@ -158,11 +158,7 @@ module Pod
# #
def module_map_path def module_map_path
basename = "#{label}.modulemap" basename = "#{label}.modulemap"
if requires_frameworks? || !respond_to?(:build_headers) support_files_dir + basename
support_files_dir + basename
else
build_headers.root + product_module_name + basename
end
end end
# @return [Pathname] the absolute path of the bridge support file. # @return [Pathname] the absolute path of the bridge support file.
......
...@@ -377,6 +377,20 @@ module Pod ...@@ -377,6 +377,20 @@ module Pod
root_spec.name root_spec.name
end end
# @return [Pathname] the absolute path of the LLVM module map file that
# defines the module structure for the compiler.
#
def module_map_path
basename = "#{label}.modulemap"
if requires_frameworks?
super
elsif file_accessors.any?(&:module_map)
build_headers.root + product_module_name + basename
else
sandbox.public_headers.root + product_module_name + basename
end
end
# @param [String] bundle_name # @param [String] bundle_name
# The name of the bundle product, which is given by the +spec+. # The name of the bundle product, which is given by the +spec+.
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment