Commit 157bdb28 authored by Swizzlr's avatar Swizzlr

remove debug code and ensure $(inherited) is always passed

parent b17ddf52
...@@ -49,7 +49,7 @@ module Pod ...@@ -49,7 +49,7 @@ module Pod
'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target), 'OTHER_LDFLAGS' => XCConfigHelper.default_ld_flags(target),
'PODS_ROOT' => target.relative_pods_root, 'PODS_ROOT' => target.relative_pods_root,
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1', 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
'OTHER_CFLAGS' => XCConfigHelper.quote(header_search_path_flags) 'OTHER_CFLAGS' => '$(inherited)' + XCConfigHelper.quote(header_search_path_flags)
}) })
target.pod_targets.each do |pod_target| target.pod_targets.each do |pod_target|
...@@ -61,11 +61,6 @@ module Pod ...@@ -61,11 +61,6 @@ module Pod
file_accessor.vendored_libraries.each do |vendored_library| file_accessor.vendored_libraries.each do |vendored_library|
XCConfigHelper.add_library_build_settings(vendored_library, @xcconfig, target.sandbox.root) XCConfigHelper.add_library_build_settings(vendored_library, @xcconfig, target.sandbox.root)
end end
@xcconfig.merge!('OTHER_CFLAGS' => '$(inherited)')
if pod_target.target_definition.inhibits_warnings_for_pod?(file_accessor.spec.root.name)
#then @xcconfig.merge!('OTHER_CFLAGS' => "$(inherited) #{XCConfigHelper.quote(pod_target.build_headers.search_paths)}")
else UI.warn('do not inhibit')
end
end end
end end
......
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